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

better arg without value handling

Browse Source 
this was segv-ing:

vips tiffsave v26722.tif v26722.pyr.tif --tile -tile-width 256

(only one hypen before tile-width)

thanks Ruven
This commit is contained in:
John Cupitt 2013-03-17 15:19:37 +00:00
parent 0f633da128
commit f5188ee3f6
2 changed files with 64 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -1,5 +1,6 @@
6/2/13 started 7.32.2
- removed some left-over debugging code from configure.ac
- better handling of args without values, thanks Ruven
6/2/13 started 7.32.1
- fix --without-lcms, thanks speckins

63
libvips/iofuncs/object.c
View File

@ -1462,6 +1462,29 @@ vips_enum_error( VipsObjectClass *class, GType otype, const char *value )
g_type_name( otype ), value, vips_buf_all( &buf ) );
}
static void
vips_object_no_value( VipsObject *object, const char *name )
{
VipsObjectClass *class = VIPS_OBJECT_GET_CLASS( object );
GParamSpec *pspec;
VipsArgumentClass *argument_class;
VipsArgumentInstance *argument_instance;
if( vips_object_get_argument( object, name,
&pspec, &argument_class, &argument_instance ) )
g_assert( 0 );
if( strcmp( name, g_param_spec_get_name( pspec ) ) == 0 )
vips_error( class->nickname,
_( "no value supplied for argument '%s'" ), name );
else
vips_error( class->nickname,
_( "no value supplied for argument '%s' ('%s')" ),
name,
g_param_spec_get_name( pspec ) );
}
/* Set a named arg from a string.
*/
int
@ -1498,6 +1521,11 @@ vips_object_set_argument_from_string( VipsObject *object,
flags = vips_operation_get_flags(
VIPS_OPERATION( object ) );
if( !value ) {
vips_object_no_value( object, name );
return( -1 );
}
/* Read the filename. vips_foreign_load_options()
* handles embedded options.
*/
@ -1525,6 +1553,11 @@ vips_object_set_argument_from_string( VipsObject *object,
(oclass = g_type_class_ref( otype )) ) {
VipsObject *new_object;
if( !value ) {
vips_object_no_value( object, name );
return( -1 );
}
if( !(new_object =
vips_object_new_from_string( oclass, value )) )
return( -1 );
@ -1560,6 +1593,11 @@ vips_object_set_argument_from_string( VipsObject *object,
else if( G_IS_PARAM_SPEC_INT( pspec ) ) {
int i;
if( !value ) {
vips_object_no_value( object, name );
return( -1 );
}
if( sscanf( value, "%d", &i ) != 1 ) {
vips_error( class->nickname,
_( "'%s' is not an integer" ), value );
@ -1574,6 +1612,11 @@ vips_object_set_argument_from_string( VipsObject *object,
*/
long long l;
if( !value ) {
vips_object_no_value( object, name );
return( -1 );
}
if( sscanf( value, "%Ld", &l ) != 1 ) {
vips_error( class->nickname,
_( "'%s' is not an integer" ), value );
@ -1586,6 +1629,11 @@ vips_object_set_argument_from_string( VipsObject *object,
else if( G_IS_PARAM_SPEC_DOUBLE( pspec ) ) {
double d;
if( !value ) {
vips_object_no_value( object, name );
return( -1 );
}
if( sscanf( value, "%lg", &d ) != 1 ) {
vips_error( class->nickname,
_( "'%s' is not a double" ), value );
@ -1598,6 +1646,11 @@ vips_object_set_argument_from_string( VipsObject *object,
else if( G_IS_PARAM_SPEC_ENUM( pspec ) ) {
GEnumValue *enum_value;
if( !value ) {
vips_object_no_value( object, name );
return( -1 );
}
if( !(enum_value = g_enum_get_value_by_name(
g_type_class_ref( otype ), value )) ) {
if( !(enum_value = g_enum_get_value_by_nick(
@ -1615,6 +1668,11 @@ vips_object_set_argument_from_string( VipsObject *object,
*/
int i;
if( !value ) {
vips_object_no_value( object, name );
return( -1 );
}
if( sscanf( value, "%d", &i ) != 1 ) {
vips_error( class->nickname,
_( "'%s' is not an integer" ), value );
@ -1625,6 +1683,11 @@ vips_object_set_argument_from_string( VipsObject *object,
g_value_set_flags( &gvalue, i );
}
else {
if( !value ) {
vips_object_no_value( object, name );
return( -1 );
}
g_value_init( &gvalue, G_TYPE_STRING );
g_value_set_string( &gvalue, value );
}