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

remove warnings from profile compat check

Browse Source 
since they can be triggered under normal circs. now when you thumbnail a
CMYK image
This commit is contained in:
John Cupitt 2018-12-28 15:06:56 +00:00
parent c5d0ca8300
commit 9c73539258
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libvips/colour/icc_transform.c
View File

@ -38,6 +38,9 @@
* - more input profile sanity tests * - more input profile sanity tests
* 8/3/18 * 8/3/18
* - attach fallback profile on import if we used it * - attach fallback profile on import if we used it
* 28/12/18
* - remove warning messages from vips_icc_is_compatible_profile() since
* they can be triggered under normal circumstances
*/ */
/* /*
@ -1250,7 +1253,7 @@ vips_icc_ac2rc( VipsImage *in, VipsImage **out, const char *profile_filename )
return( 0 ); return( 0 );
} }
/* TRUE if a profile is compatible with an image. /* TRUE if a profile is sane and is compatible with an image.
*/ */
gboolean gboolean
vips_icc_is_compatible_profile( VipsImage *image, vips_icc_is_compatible_profile( VipsImage *image,
@ -1258,22 +1261,19 @@ vips_icc_is_compatible_profile( VipsImage *image,
{ {
cmsHPROFILE profile; cmsHPROFILE profile;
if( !(profile = cmsOpenProfileFromMem( data, data_length )) ) { if( !(profile = cmsOpenProfileFromMem( data, data_length )) )
g_warning( "%s", _( "corrupt profile" ) ); /* Corrupt profile.
*/
return( FALSE ); return( FALSE );
}
if( vips_image_expected_bands( image ) != if( vips_image_expected_bands( image ) !=
vips_icc_profile_needs_bands( profile ) ) { vips_icc_profile_needs_bands( profile ) ) {
VIPS_FREEF( cmsCloseProfile, profile ); VIPS_FREEF( cmsCloseProfile, profile );
g_warning( "%s",
_( "profile incompatible with image" ) );
return( FALSE ); return( FALSE );
} }
if( vips_image_expected_sig( image ) != cmsGetColorSpace( profile ) ) { if( vips_image_expected_sig( image ) != cmsGetColorSpace( profile ) ) {
VIPS_FREEF( cmsCloseProfile, profile ); VIPS_FREEF( cmsCloseProfile, profile );
g_warning( "%s",
_( "profile colourspace differs from image" ) );
return( FALSE ); return( FALSE );
} }

2
libvips/foreign/foreign.c
View File

@ -1515,7 +1515,7 @@ vips__foreign_convert_saveable( VipsImage *in, VipsImage **ready,
/* Some format libraries, like libpng, will throw a hard error if the /* Some format libraries, like libpng, will throw a hard error if the
* profile is inappropriate for this image type. With profiles inherited * profile is inappropriate for this image type. With profiles inherited
* from a source image, this can happen all the time, so we * from a source image, this can happen all the time, so we
* want to just drop the profile in this case. * want to silently drop the profile in this case.
*/ */
if( vips_image_get_typeof( in, VIPS_META_ICC_NAME ) ) { if( vips_image_get_typeof( in, VIPS_META_ICC_NAME ) ) {
void *data; void *data;