fix --delete option to vipsthumbnail

oops, ! missing
This commit is contained in:
John Cupitt 2013-11-09 13:10:11 +00:00
parent f8f61fedf3
commit 3380f15da5
2 changed files with 4 additions and 2 deletions

View File

@ -4,6 +4,7 @@
elsewhere in vips elsewhere in vips
- fix blocked caching of sequential load operations - fix blocked caching of sequential load operations
- fix cache flags - fix cache flags
- fix --delete option to vipsthumbnail
10/10/13 started 7.36.2 10/10/13 started 7.36.2
- better jpeg startup - better jpeg startup

View File

@ -65,6 +65,7 @@ static gboolean delete_profile = FALSE;
*/ */
static gboolean nosharpen = FALSE; static gboolean nosharpen = FALSE;
static gboolean nodelete_profile = FALSE; static gboolean nodelete_profile = FALSE;
static gboolean verbose = FALSE;
static GOptionEntry options[] = { static GOptionEntry options[] = {
{ "size", 's', 0, { "size", 's', 0,
@ -95,7 +96,7 @@ static GOptionEntry options[] = {
G_OPTION_ARG_NONE, &delete_profile, G_OPTION_ARG_NONE, &delete_profile,
N_( "delete profile from exported image" ), NULL }, N_( "delete profile from exported image" ), NULL },
{ "verbose", 'v', G_OPTION_FLAG_HIDDEN, { "verbose", 'v', G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_NONE, NULL, G_OPTION_ARG_NONE, &verbose,
N_( "(deprecated, does nothing)" ), NULL }, N_( "(deprecated, does nothing)" ), NULL },
{ "nodelete", 'l', G_OPTION_FLAG_HIDDEN, { "nodelete", 'l', G_OPTION_FLAG_HIDDEN,
G_OPTION_ARG_NONE, &nodelete_profile, G_OPTION_ARG_NONE, &nodelete_profile,
@ -406,7 +407,7 @@ thumbnail_shrink( VipsObject *thumbnail, VipsImage *in,
vips_image_get_typeof( in, VIPS_META_ICC_NAME ) ) { vips_image_get_typeof( in, VIPS_META_ICC_NAME ) ) {
vips_info( "vipsthumbnail", vips_info( "vipsthumbnail",
"deleting profile from output image" ); "deleting profile from output image" );
if( vips_image_remove( in, VIPS_META_ICC_NAME ) ) if( !vips_image_remove( in, VIPS_META_ICC_NAME ) )
return( NULL ); return( NULL );
} }