diff options
author | Miles Bader <[email protected]> | 2007-08-13 13:51:08 +0000 |
---|---|---|
committer | Miles Bader <[email protected]> | 2007-08-13 13:51:08 +0000 |
commit | aaf34461ff5804e5cebe163b31e535da72e81d87 (patch) | |
tree | b096310b459b78e437f08ac0f1f00954840a5db5 /src/image.c | |
parent | 61d032dfd91b811d59acd7605ac02758be97e912 (diff) | |
parent | 37cc095b6a175fb5a2fb18fa029eaf3aa3b3fa53 (diff) |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 846-851)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 88-92)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 242-244)
- Update from CVS
Revision: [email protected]/emacs--multi-tty--0--patch-31
Diffstat (limited to 'src/image.c')
-rw-r--r-- | src/image.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/image.c b/src/image.c index d38ca04e08..96335558af 100644 --- a/src/image.c +++ b/src/image.c @@ -1644,6 +1644,8 @@ search_image_cache (f, spec, hash) struct image_cache *c = FRAME_X_IMAGE_CACHE (f); int i = hash % IMAGE_CACHE_BUCKETS_SIZE; + if (!c) return NULL; + /* If the image spec does not specify a background color, the cached image must have the same background color as the current frame. The foreground color must also match, for the sake of monochrome @@ -1655,13 +1657,10 @@ search_image_cache (f, spec, hash) for formats that don't use transparency (such as jpeg), or if the image spec specifies :background. However, the extra memory usage is probably negligible in practice, so we don't bother. */ - if (!c) return NULL; for (img = c->buckets[i]; img; img = img->next) if (img->hash == hash && !NILP (Fequal (img->spec, spec)) - /* If the image spec specifies a background, it doesn't matter - what the frame background is. */ && img->frame_foreground == FRAME_FOREGROUND_PIXEL (f) && img->frame_background == FRAME_BACKGROUND_PIXEL (f)) break; @@ -6362,11 +6361,14 @@ png_load (f, img) PNG_BACKGROUND_GAMMA_SCREEN, 0, 1.0); } } + /* The commented-out code checked if the png specifies a default + background color, and uses that. Since we use the current + frame background, it is OK for us to ignore this. + else if (fn_png_get_bKGD (png_ptr, info_ptr, &image_bg)) - /* Image contains a background color with which to - combine the image. */ fn_png_set_background (png_ptr, image_bg, PNG_BACKGROUND_GAMMA_FILE, 1, 1.0); + */ else { /* Image does not contain a background color with which |