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

fix spngsave conversion

Browse Source 
It was all mixed up. We don't need to call colourspace -- this is done
for us by the SAVEABLE system.

Fixes "vips identity x.png" error, see:

https://github.com/libvips/libvips/pull/2808#issuecomment-1133947162
This commit is contained in:
John Cupitt 2022-05-23 11:51:54 +01:00
parent 85c24481be
commit 047bef50d9
1 changed files with 17 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
libvips/foreign/spngsave.c
View File

@ -576,39 +576,9 @@ vips_foreign_save_spng_build( VipsObject *object )
in = save->ready; in = save->ready;
g_object_ref( in ); g_object_ref( in );
/* Deprecated "colours" arg just sets bitdepth large enough to hold /* in will have been converted to uint16 for high-bitdepth
* that many colours. * formats (eg. float) ... we need to check Type to see if we want
*/ * to save as 8 or 16-bits. Eg. imagine a float image tagged as sRGB.
if( vips_object_argument_isset( object, "colours" ) )
spng->bitdepth = ceil( log2( spng->colours ) );
/* If no output bitdepth has been specified, use input Type to pick.
* We only go for 16 bits for the types where we know there's a
* 0-65535 range.
*/
if( !vips_object_argument_isset( object, "bitdepth" ) )
spng->bitdepth =
(in->Type == VIPS_INTERPRETATION_RGB16 ||
in->Type == VIPS_INTERPRETATION_GREY16) ? 16 : 8;
if( spng->bitdepth > 8 )
interpretation = in->Bands > 2 ?
VIPS_INTERPRETATION_RGB16 :
VIPS_INTERPRETATION_GREY16;
else
interpretation = in->Bands > 2 ?
VIPS_INTERPRETATION_sRGB :
VIPS_INTERPRETATION_B_W;
if( vips_colourspace( in, &x, interpretation, NULL ) ) {
g_object_unref( in );
return( -1 );
}
g_object_unref( in );
in = x;
/* colourspace will leave float srgb as float. We need to force to
* uchar in these cases.
*/ */
if( in->Type == VIPS_INTERPRETATION_sRGB || if( in->Type == VIPS_INTERPRETATION_sRGB ||
in->Type == VIPS_INTERPRETATION_B_W ) { in->Type == VIPS_INTERPRETATION_B_W ) {
@ -622,8 +592,21 @@ vips_foreign_save_spng_build( VipsObject *object )
in = x; in = x;
} }
/* If no output bitdepth has been specified, use input Type to pick.
* We only go for 16 bits for the types where we know there's a
* 0-65535 range.
*/
if( !vips_object_argument_isset( object, "bitdepth" ) )
spng->bitdepth = in->BandFmt == VIPS_FORMAT_UCHAR ? 8 : 16;
/* Deprecated "colours" arg just sets bitdepth large enough to hold
* that many colours.
*/
if( vips_object_argument_isset( object, "colours" ) )
spng->bitdepth = ceil( log2( spng->colours ) );
/* If this is a RGB or RGBA image and a low bit depth has been /* If this is a RGB or RGBA image and a low bit depth has been
* requested, enable palettization. * requested, enable palettisation.
*/ */
if( in->Bands > 2 && if( in->Bands > 2 &&
spng->bitdepth < 8 ) spng->bitdepth < 8 )