diff --git a/ChangeLog b/ChangeLog index 1bf06c52..f86e1cd8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,7 @@ - fix gettext startup - all "colour" in messages changed to "color", have a proper en_GB translation file +- vipsthumbnail delete profile failed if there was a profile 21/3/10 started 7.21.3 - added progress feedback to threadpool diff --git a/TODO b/TODO index af3cc379..254fb395 100644 --- a/TODO +++ b/TODO @@ -1,15 +1,4 @@ - -- change all colour -> color in messages - - remember to update the german po file for string changes - - update the en_GB po - - test, and test de as well - - - - int bicubic needs more precision? try a 10x upscale and compare to the double path diff --git a/tools/iofuncs/vipsthumbnail.c b/tools/iofuncs/vipsthumbnail.c index 25399450..e0b8893d 100644 --- a/tools/iofuncs/vipsthumbnail.c +++ b/tools/iofuncs/vipsthumbnail.c @@ -15,6 +15,8 @@ * 13/5/10 * - oops hehe residual sharpen test was reversed * - and the mask coefficients were messed up + * 26/5/10 + * - delete failed if there was a profile */ #ifdef HAVE_CONFIG_H @@ -283,7 +285,11 @@ shrink_factor( IMAGE *in, IMAGE *out, if( verbose ) printf( "deleting profile from output image\n" ); - if( im_meta_remove( x, IM_META_ICC_NAME ) ) + /* Only try to remove if it exists to avoid extra error + * messages. + */ + if( im_meta_get_typeof( x, IM_META_ICC_NAME ) && + !im_meta_remove( x, IM_META_ICC_NAME ) ) return( -1 ); }