diff options
| author | Henning Makholm <henning@makholm.net> | 2006-02-19 18:00:00 (EST) |
|---|---|---|
| committer | Julien Jorge <julien.jorge@stuff-o-matic.com> | 2013-01-10 16:05:04 (EST) |
| commit | 4877693228e5f942db451c5f2b0ccabb5b050813 (patch) | |
| tree | 72b1f863eaa746e6aac955172e7081e40ee0418c /flatspec.c | |
| parent | 00a8b13b5bf8cf2c367a0db3ae09086e45230968 (diff) | |
| download | xcftools-4877693228e5f942db451c5f2b0ccabb5b050813.zip xcftools-4877693228e5f942db451c5f2b0ccabb5b050813.tar.gz xcftools-4877693228e5f942db451c5f2b0ccabb5b050813.tar.bz2 | |
Import of release 1.0.0
Diffstat (limited to 'flatspec.c')
| -rw-r--r-- | flatspec.c | 14 |
1 files changed, 8 insertions, 6 deletions
@@ -83,8 +83,10 @@ color_by_layers(struct FlattenSpec *spec) int colormap_is_colored = 0 ; enum out_color_mode grayish = COLOR_MONO ; int i ; - - if( degrayPixel(spec->default_pixel) < 0 ) + + if( spec->default_pixel == CHECKERED_BACKGROUND ) + grayish = COLOR_GRAY ; + else if( degrayPixel(spec->default_pixel) < 0 ) return COLOR_RGB ; for( i=0; i<colormapLength; i++ ) { if( colormap[i] == NEWALPHA(0,0) || colormap[i] == NEWALPHA(-1,0) ) @@ -211,7 +213,7 @@ complete_flatspec(struct FlattenSpec *spec, guesser guess_callback) } } if( spec->partial_transparency_mode == ALLOW_PARTIAL_TRANSPARENCY && - (!anyPartial || FULLALPHA(spec->default_pixel)) ) + (!anyPartial || ALPHA(spec->default_pixel) >= 128) ) spec->partial_transparency_mode = PARTIAL_TRANSPARENCY_IMPOSSIBLE ; /* Initialize layers and print overview if we're verbose */ @@ -223,8 +225,8 @@ complete_flatspec(struct FlattenSpec *spec, guesser guess_callback) spec->layers[i].dim.width, spec->layers[i].dim.height, spec->layers[i].dim.c.l - spec->dim.c.l, spec->layers[i].dim.c.t - spec->dim.c.t, - showGimpImageType(spec->layers[i].type), - showGimpLayerModeEffects(spec->layers[i].mode)); + _(showGimpImageType(spec->layers[i].type)), + _(showGimpLayerModeEffects(spec->layers[i].mode))); if( spec->layers[i].opacity < 255 ) fprintf(stderr,"/%02d%%",spec->layers[i].opacity * 100 / 255); if( XCF.layers[i].hasMask ) @@ -271,7 +273,7 @@ analyse_colormode(struct FlattenSpec *spec,rgba **allPixels, if( spec->partial_transparency_mode == DISSOLVE_PARTIAL_TRANSPARENCY || spec->partial_transparency_mode == PARTIAL_TRANSPARENCY_IMPOSSIBLE ) known_absent |= 4 ; - if( FULLALPHA(spec->default_pixel) ) known_absent |= 12 ; + if( ALPHA(spec->default_pixel) >= 128 ) known_absent |= 12 ; else if( spec->default_pixel == FORCE_ALPHA_CHANNEL ) assume_present |= 8 ; status = 15 - (known_absent | assume_present) ; |