diff options
| author | Chong Yidong | 2007-08-06 16:02:12 +0000 |
|---|---|---|
| committer | Chong Yidong | 2007-08-06 16:02:12 +0000 |
| commit | 465d8f275afb360dcc4b8231c9658e299d47a551 (patch) | |
| tree | 65c8d85ed7576f638f7487e3e7ae93311ba2f109 /src | |
| parent | ca5e6fd576578f2b9253d25b9054d3386389346e (diff) | |
| download | emacs-465d8f275afb360dcc4b8231c9658e299d47a551.tar.gz emacs-465d8f275afb360dcc4b8231c9658e299d47a551.zip | |
(png_load): Ignore png-supplied background color.
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/image.c b/src/image.c index 74bb1d75451..fb0420045e2 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -6359,11 +6359,15 @@ png_load (f, img) | |||
| 6359 | PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); | 6359 | PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); |
| 6360 | } | 6360 | } |
| 6361 | } | 6361 | } |
| 6362 | /* The commented-out code checked if the png specifies a default | ||
| 6363 | background color, and uses that. Since we rely on the | ||
| 6364 | current frame background, it is actually OK for us to ignore | ||
| 6365 | this part. | ||
| 6366 | |||
| 6362 | else if (fn_png_get_bKGD (png_ptr, info_ptr, &image_bg)) | 6367 | else if (fn_png_get_bKGD (png_ptr, info_ptr, &image_bg)) |
| 6363 | /* Image contains a background color with which to | ||
| 6364 | combine the image. */ | ||
| 6365 | fn_png_set_background (png_ptr, image_bg, | 6368 | fn_png_set_background (png_ptr, image_bg, |
| 6366 | PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); | 6369 | PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); |
| 6370 | */ | ||
| 6367 | else | 6371 | else |
| 6368 | { | 6372 | { |
| 6369 | /* Image does not contain a background color with which | 6373 | /* Image does not contain a background color with which |