Mercurial > emacs
comparison src/image.c @ 82297:51a0886252f1
(png_load): Ignore png-supplied background color.
author | Chong Yidong <cyd@stupidchicken.com> |
---|---|
date | Mon, 06 Aug 2007 16:02:12 +0000 |
parents | b98604865ea0 |
children | 7bec7031afab |
comparison
equal
deleted
inserted
replaced
82296:54c32215085b | 82297:51a0886252f1 |
---|---|
6357 | 6357 |
6358 fn_png_set_background (png_ptr, &user_bg, | 6358 fn_png_set_background (png_ptr, &user_bg, |
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 |
6370 to combine the image data via an alpha channel. Use | 6374 to combine the image data via an alpha channel. Use |
6371 the frame's background instead. */ | 6375 the frame's background instead. */ |