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

use vips_flatten() in save

Browse Source 
alpha is automatically flattened out if the save operation does not
support it
This commit is contained in:
John Cupitt 2012-06-18 17:26:50 +01:00
parent 70b14c2f1d
commit fd98d100a9
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
TODO
View File

@ -1,6 +1,3 @@
- on RGBA -> RGB conversion in foreign.c, need to use A channel to mask off
RGB ... Opera.png looks bad without it
- vipsthumbnail.c could use this instead of im_tile_cache() to get seq hint
set

21
libvips/foreign/foreign.c
View File

@ -2,6 +2,8 @@
*
* 7/2/12
* - add support for sequential reads
* 18/6/12
* - flatten alpha with vips_flatten()
*/
/*
@ -1147,11 +1149,19 @@ vips_foreign_convert_saveable( VipsForeignSave *save )
/* Get the bands right.
*/
if( in->Coding == VIPS_CODING_NONE ) {
if( in->Bands == 2 &&
class->saveable != VIPS_SAVEABLE_RGBA ) {
/* Do we need to flatten out an alpha channel? There needs to
* be an alpha there now, and this writer needs to not support
* alpha.
*/
if( (in->Bands == 2 ||
(in->Bands == 4 &&
in->Type != VIPS_INTERPRETATION_CMYK)) &&
(class->saveable == VIPS_SAVEABLE_MONO ||
class->saveable == VIPS_SAVEABLE_RGB ||
class->saveable == VIPS_SAVEABLE_RGB_CMYK) ) {
VipsImage *out;
if( vips_extract_band( in, &out, 0, NULL ) ) {
if( vips_flatten( in, &out, 0, NULL ) ) {
g_object_unref( in );
return( -1 );
}
@ -1159,6 +1169,11 @@ vips_foreign_convert_saveable( VipsForeignSave *save )
in = out;
}
/* Other alpha removal strategies ... just drop the extra
* bands.
*/
else if( in->Bands > 3 &&
(class->saveable == VIPS_SAVEABLE_RGB ||
(class->saveable == VIPS_SAVEABLE_RGB_CMYK &&