fix thumbnail regression with cmyk in and out

56d98f3ef0 broke cmyk->cymk thumbnails
This commit is contained in:
John Cupitt 2019-04-23 17:09:20 +01:00
parent 56d98f3ef0
commit d2a9a20a78
3 changed files with 9 additions and 3 deletions

View File

@ -3,6 +3,8 @@
*
* 21/12/18
* - from CMYK2XYZ.c
* 09/01/2019
* - add CMYK <-> XYZ conversions if no lcms2 has been found
*/
/*

View File

@ -21,8 +21,6 @@
* https://github.com/lovell/sharp/issues/193
* 27/12/18
* - add CMYK conversions
* 09/01/2019
* - add CMYK <-> XYZ conversions if no lcms2 has been found
*/
/*

View File

@ -599,8 +599,14 @@ vips_thumbnail_build( VipsObject *object )
have_imported = TRUE;
}
/* To the processing colourspace. This will unpack LABQ as well.
/* To the processing colourspace. This will unpack LABQ, import CMYK,
* etc.
*
* If this is a CMYK image, we need to set have_imported since we only
* want to export at the end.
*/
if( in->Type == VIPS_INTERPRETATION_CMYK )
have_imported = TRUE;
g_info( "converting to processing space %s",
vips_enum_nick( VIPS_TYPE_INTERPRETATION, interpretation ) );
if( vips_colourspace( in, &t[2], interpretation, NULL ) )