sergiotarxz/libvips
sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow enums as input args

Browse Source
This commit is contained in:
John Cupitt 2011-10-02 17:31:08 +01:00
parent 3acf9fd2aa
commit b0249a85d8
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
libvips/iofuncs/object.c
View File

@ -1205,10 +1205,8 @@ vips_object_set_argument_from_string( VipsObject *object,
GValue gvalue = { 0 }; GValue gvalue = { 0 };
#ifdef DEBUG VIPS_DEBUG_MSG( "vips_object_set_argument_from_string: %s = %s\n",
printf( "vips_object_set_argument_from_string: %s = %s\n",
name, value ); name, value );
#endif /*DEBUG*/
if( vips_object_get_argument( object, name, if( vips_object_get_argument( object, name,
&pspec, &argument_class, &argument_instance ) ) &pspec, &argument_class, &argument_instance ) )
@ -1252,6 +1250,25 @@ vips_object_set_argument_from_string( VipsObject *object,
g_value_init( &gvalue, G_TYPE_DOUBLE ); g_value_init( &gvalue, G_TYPE_DOUBLE );
g_value_set_double( &gvalue, atof( value ) ); g_value_set_double( &gvalue, atof( value ) );
} }
else if( G_IS_PARAM_SPEC_ENUM( pspec ) ) {
GEnumValue *enum_value;
if( !(enum_value = g_enum_get_value_by_name(
g_type_class_ref( otype ), value )) ) {
if( !(enum_value = g_enum_get_value_by_nick(
g_type_class_ref( otype ), value )) ) {
vips_error(
"vips_object_set_argument_from_string",
_( "enum '%s' has no member '%s'" ),
g_type_name( otype ),
value );
return( -1 );
}
}
g_value_init( &gvalue, otype );
g_value_set_enum( &gvalue, enum_value->value );
}
else { else {
g_value_init( &gvalue, G_TYPE_STRING ); g_value_init( &gvalue, G_TYPE_STRING );
g_value_set_string( &gvalue, value ); g_value_set_string( &gvalue, value );