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

SPNG_DECODE_TRNS flag was missing

Browse Source 
see https://github.com/libvips/libvips/pull/1682#pullrequestreview-428866084
This commit is contained in:
John Cupitt 2020-06-11 13:49:51 +01:00
parent 61628eefdf
commit f96f2d3014
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libvips/foreign/spngload.c
View File

@ -483,11 +483,16 @@ vips_foreign_load_png_load( VipsForeignLoad *load )
VipsImage **t = (VipsImage **) VipsImage **t = (VipsImage **)
vips_object_local_array( VIPS_OBJECT( load ), 3 ); vips_object_local_array( VIPS_OBJECT( load ), 3 );
enum spng_decode_flags flags;
int error; int error;
if( vips_source_decode( png->source ) ) if( vips_source_decode( png->source ) )
return( -1 ); return( -1 );
/* Decode transparency, if available.
*/
flags = SPNG_DECODE_TRNS;
if( png->ihdr.interlace_method != SPNG_INTERLACE_NONE ) { if( png->ihdr.interlace_method != SPNG_INTERLACE_NONE ) {
/* Arg awful interlaced image. We have to load to a huge mem /* Arg awful interlaced image. We have to load to a huge mem
* buffer, then copy to out. * buffer, then copy to out.
@ -500,7 +505,7 @@ vips_foreign_load_png_load( VipsForeignLoad *load )
if( (error = spng_decode_image( png->ctx, if( (error = spng_decode_image( png->ctx,
VIPS_IMAGE_ADDR( t[0], 0, 0 ), VIPS_IMAGE_ADDR( t[0], 0, 0 ),
VIPS_IMAGE_SIZEOF_IMAGE( t[0] ), VIPS_IMAGE_SIZEOF_IMAGE( t[0] ),
png->fmt, 0 )) ) { png->fmt, flags )) ) {
vips_error( class->nickname, vips_error( class->nickname,
"%s", spng_strerror( error ) ); "%s", spng_strerror( error ) );
return( -1 ); return( -1 );
@ -513,10 +518,12 @@ vips_foreign_load_png_load( VipsForeignLoad *load )
t[0] = vips_image_new(); t[0] = vips_image_new();
vips_foreign_load_png_set_header( png, t[0] ); vips_foreign_load_png_set_header( png, t[0] );
/* Initialize for progressive decoding. /* We can decode these progressively.
*/ */
flags |= SPNG_DECODE_PROGRESSIVE;
if( (error = spng_decode_image( png->ctx, NULL, 0, if( (error = spng_decode_image( png->ctx, NULL, 0,
png->fmt, SPNG_DECODE_PROGRESSIVE )) ) { png->fmt, flags )) ) {
vips_error( class->nickname, vips_error( class->nickname,
"%s", spng_strerror( error ) ); "%s", spng_strerror( error ) );
return( -1 ); return( -1 );