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

back to srgb/b-w processing space

Browse Source 
for compat in thumbnail behaviour
This commit is contained in:
John Cupitt 2021-02-27 16:34:50 +00:00
parent 303513e52d
commit e1fc576252
1 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libvips/resample/thumbnail.c
View File

@ -30,6 +30,9 @@
* - add thumbnail_source
* 2/6/20
* - add subifd pyr support
* 27/2/21
* - simplify rules re. processing space, colour management and linear
* mode
*/
/*
@ -673,7 +676,7 @@ vips_thumbnail_build( VipsObject *object )
*/
preshrunk_page_height = vips_image_get_page_height( in );
/* Coded forms need special unpacking.
/* RAD needs special unpacking.
*/
if( in->Coding == VIPS_CODING_RAD ) {
g_info( "unpacking Rad to float" );
@ -684,13 +687,6 @@ vips_thumbnail_build( VipsObject *object )
return( -1 );
in = t[12];
}
else if( in->Coding == VIPS_CODING_LABQ ) {
g_info( "unpacking LABQ to float" );
if( vips_LabQ2Lab( in, &t[12], NULL ) )
return( -1 );
in = t[12];
}
/* In linear mode, we need to transform to a linear space before
* vips_resize().
@ -745,6 +741,25 @@ vips_thumbnail_build( VipsObject *object )
in = t[2];
}
}
else {
/* In non-linear mode, use sRGB or B_W as the processing
* space.
*/
VipsInterpretation interpretation;
if( in->Bands < 3 )
interpretation = VIPS_INTERPRETATION_B_W;
else
interpretation = VIPS_INTERPRETATION_sRGB;
g_info( "converting to processing space %s",
vips_enum_nick( VIPS_TYPE_INTERPRETATION,
interpretation ) );
if( vips_colourspace( in, &t[2], interpretation,
NULL ) )
return( -1 );
in = t[2];
}
/* Shrink to preshrunk_page_height, so we work for multi-page images.
*/
@ -1393,7 +1408,7 @@ vips_thumbnail_buffer_init( VipsThumbnailBuffer *buffer )
* * @intent: #VipsIntent, rendering intent
* * @option_string: %gchararray, extra loader options
*
* Exacty as vips_thumbnail(), but read from a memory buffer. One extra
* Exactly as vips_thumbnail(), but read from a memory buffer. One extra
* optional argument, @option_string, lets you pass options to the underlying
* loader.
*
@ -1589,7 +1604,7 @@ vips_thumbnail_source_init( VipsThumbnailSource *source )
* * @intent: #VipsIntent, rendering intent
* * @option_string: %gchararray, extra loader options
*
* Exacty as vips_thumbnail(), but read from a source. One extra
* Exactly as vips_thumbnail(), but read from a source. One extra
* optional argument, @option_string, lets you pass options to the underlying
* loader.
*
@ -1696,7 +1711,7 @@ vips_thumbnail_image_init( VipsThumbnailImage *image )
* * @export_profile: %gchararray, export ICC profile
* * @intent: #VipsIntent, rendering intent
*
* Exacty as vips_thumbnail(), but read from an existing image.
* Exactly as vips_thumbnail(), but read from an existing image.
*
* This operation
* is not able to exploit shrink-on-load features of image load libraries, so