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

Revert "improve transparency support"

Browse Source 
This reverts commit 20c9a7f7cc.
This commit is contained in:
John Cupitt 2020-06-09 02:04:55 +01:00
parent ad73034a30
commit 70a1dc0926
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
libvips/foreign/spngload.c
View File

@ -41,11 +41,12 @@
* set a chunk size limit with spng_set_chunks_limits() when that API is done * set a chunk size limit with spng_set_chunks_limits() when that API is done
* *
* load only, there's no save support for now * load only, there's no save support for now
*
*/ */
/* /*
*/
#define DEBUG #define DEBUG
*/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
@ -315,28 +316,37 @@ vips_foreign_load_png_header( VipsForeignLoad *load )
switch( png->ihdr.color_type ) { switch( png->ihdr.color_type ) {
case SPNG_COLOR_TYPE_GRAYSCALE_ALPHA:
case SPNG_COLOR_TYPE_GRAYSCALE: case SPNG_COLOR_TYPE_GRAYSCALE:
png->bands = 1; png->bands = 1;
if( !spng_get_trns( png->ctx ) ) png->interpretation = VIPS_INTERPRETATION_B_W;
png->bands += 1; png->fmt = SPNG_FMT_PNG;
break;
case SPNG_COLOR_TYPE_GRAYSCALE_ALPHA:
png->bands = 2;
png->interpretation = VIPS_INTERPRETATION_B_W; png->interpretation = VIPS_INTERPRETATION_B_W;
png->fmt = SPNG_FMT_PNG; png->fmt = SPNG_FMT_PNG;
break; break;
case SPNG_COLOR_TYPE_TRUECOLOR: case SPNG_COLOR_TYPE_TRUECOLOR:
case SPNG_COLOR_TYPE_TRUECOLOR_ALPHA:
png->bands = 3; png->bands = 3;
if( !spng_get_trns( png->ctx ) )
png->bands += 1;
png->interpretation = VIPS_INTERPRETATION_sRGB; png->interpretation = VIPS_INTERPRETATION_sRGB;
png->fmt = SPNG_FMT_PNG; png->fmt = SPNG_FMT_PNG;
break; break;
case SPNG_COLOR_TYPE_INDEXED: case SPNG_COLOR_TYPE_INDEXED:
png->bands = 3;
png->interpretation = VIPS_INTERPRETATION_sRGB;
/* Expand indexed images to RGB8.
*/
png->fmt = SPNG_FMT_RGB8;
break;
case SPNG_COLOR_TYPE_TRUECOLOR_ALPHA:
png->bands = 4; png->bands = 4;
png->interpretation = VIPS_INTERPRETATION_sRGB; png->interpretation = VIPS_INTERPRETATION_sRGB;
png->fmt = SPNG_FMT_RGBA8; png->fmt = SPNG_FMT_PNG;
break; break;
default: default:
@ -447,15 +457,10 @@ vips_foreign_load_png_load( VipsForeignLoad *load )
vips_object_local_array( VIPS_OBJECT( load ), 3 ); vips_object_local_array( VIPS_OBJECT( load ), 3 );
int error; int error;
enum spng_decode_flags;
if( vips_source_decode( png->source ) ) if( vips_source_decode( png->source ) )
return( -1 ); return( -1 );
/* We want the alpha, if present.
*/
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.
@ -468,7 +473,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, flags )) ) { png->fmt, 0 )) ) {
vips_error( class->nickname, vips_error( class->nickname,
"%s", spng_strerror( error ) ); "%s", spng_strerror( error ) );
return( -1 ); return( -1 );
@ -481,12 +486,10 @@ 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] );
/* We can decode regular PNGs progressively. /* Initialize for progressive decoding.
*/ */
flags |= SPNG_DECODE_PROGRESSIVE;
if( (error = spng_decode_image( png->ctx, NULL, 0, if( (error = spng_decode_image( png->ctx, NULL, 0,
png->fmt, flags )) ) { png->fmt, SPNG_DECODE_PROGRESSIVE )) ) {
vips_error( class->nickname, vips_error( class->nickname,
"%s", spng_strerror( error ) ); "%s", spng_strerror( error ) );
return( -1 ); return( -1 );