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

allow thumbnail colourspace export with no import

Browse Source 
allow this case:

	vipsthumbnail k2.jpg --export-profile cmyk

for an image with no embedded profile
This commit is contained in:
John Cupitt 2021-03-05 11:11:49 +00:00
parent c4d56fd475
commit 9585feb5a8
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
libvips/resample/thumbnail.c
View File

@ -855,23 +855,41 @@ vips_thumbnail_build( VipsObject *object )
* to the output space. * to the output space.
*/ */
g_info( "transforming to %s", thumbnail->export_profile ); g_info( "transforming to %s", thumbnail->export_profile );
if( thumbnail->import_profile )
g_info( "fallback input profile %s",
thumbnail->import_profile );
if( vips_icc_transform( in, &t[7], /* If there's some kind of import profile, we can transform to
thumbnail->export_profile, * the output. Otherwise we have to convert to PCS and then
"input_profile", thumbnail->import_profile, * export.
"intent", thumbnail->intent, */
"embedded", TRUE, if( thumbnail->import_profile ||
NULL ) ) (vips_image_get_typeof( in, VIPS_META_ICC_NAME ) ||
return( -1 ); thumbnail->import_profile) ) {
in = t[7]; g_info( "transforming with supplied profiles" );
if( vips_icc_transform( in, &t[7],
thumbnail->export_profile,
"input_profile", thumbnail->import_profile,
"intent", thumbnail->intent,
"embedded", TRUE,
NULL ) )
return( -1 );
in = t[7];
}
else {
g_info( "exporting with %s",
thumbnail->export_profile );
if( vips_colourspace( in, &t[7],
VIPS_INTERPRETATION_XYZ, NULL ) ||
vips_icc_export( t[7], &t[8],
"output_profile", thumbnail->export_profile,
"intent", thumbnail->intent,
NULL ) )
return( -1 );
in = t[8];
}
} }
else if( thumbnail->linear ) { else if( thumbnail->linear ) {
/* Linear mode, no colour management. We went to scRGB for /* Linear mode, no colour management. We went to scRGB for
* processing, so we now revert to the input * processing, so we now revert to the input colourspace.
* colourspace.
*/ */
g_info( "reverting to input space %s", g_info( "reverting to input space %s",
vips_enum_nick( VIPS_TYPE_INTERPRETATION, vips_enum_nick( VIPS_TYPE_INTERPRETATION,