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

better enum arg error message

Browse Source 
you now get something like:

$ vips tiffsave k2.jpg x.tif --compression poop
tiffsave: enum 'VipsForeignTiffCompression' has no member 'poop', should be one of: none, jpeg, deflate, packbits, ccittfax4, lzw
This commit is contained in:
John Cupitt 2012-08-10 13:54:42 +01:00
parent 463058c149
commit 1abac4018a
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -7,6 +7,7 @@
- be more cautious enabling YCbCr mode in tiff write
- add "DEPRECATED" flag to arguments
- jpeg load/save note and use the preferred resolution unit
- better error msgs for enum args
20/7/12 started 7.30.0
- support "rs" mode in vips7

3
libvips/conversion/sequential.c
View File

@ -80,8 +80,7 @@ vips_sequential_generate( VipsRegion *or,
*/
if( r->top < sequential->y_pos ) {
vips_error( "VipsSequential",
_( "non-sequential read --- "
"at position %d in file, but position %d requested" ),
_( "at line %d in file, but line %d requested" ),
sequential->y_pos, r->top );
return( -1 );
}

27
libvips/iofuncs/object.c
View File

@ -1438,6 +1438,29 @@ vips_object_class_install_argument( VipsObjectClass *object_class,
#endif /*DEBUG*/
}
/* Make a bad-enum error. A common and fiddly case.
*/
static void
vips_enum_error( VipsObjectClass *class, GType otype, const char *value )
{
GEnumClass *genum = G_ENUM_CLASS( g_type_class_ref( otype ) );
int i;
char str[1000];
VipsBuf buf = VIPS_BUF_STATIC( str );
/* -1 since we always have a "last" member.
*/
for( i = 0; i < genum->n_values - 1; i++ ) {
if( i > 0 )
vips_buf_appends( &buf, ", " );
vips_buf_appends( &buf, genum->values[i].value_nick );
}
vips_error( class->nickname, _( "enum '%s' has no member '%s', "
"should be one of: %s" ),
g_type_name( otype ), value, vips_buf_all( &buf ) );
}
/* Set a named arg from a string.
*/
int
@ -1578,9 +1601,7 @@ vips_object_set_argument_from_string( VipsObject *object,
g_type_class_ref( otype ), value )) ) {
if( !(enum_value = g_enum_get_value_by_nick(
g_type_class_ref( otype ), value )) ) {
vips_error( class->nickname,
_( "enum '%s' has no member '%s'" ),
g_type_name( otype ), value );
vips_enum_error( class, otype, value );
return( -1 );
}
}