Mercurial > emacs
changeset 82318:7bec7031afab
Minor cleanup.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Tue, 07 Aug 2007 16:25:26 +0000 |
| parents | c668fe19825b |
| children | 5e73544d3edb |
| files | src/image.c |
| diffstat | 1 files changed, 4 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/image.c Tue Aug 07 16:10:20 2007 +0000 +++ b/src/image.c Tue Aug 07 16:25:26 2007 +0000 @@ -1644,6 +1644,8 @@ 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 @@ 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; @@ -6360,9 +6359,8 @@ } } /* The commented-out code checked if the png specifies a default - background color, and uses that. Since we rely on the - current frame background, it is actually OK for us to ignore - this part. + 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)) fn_png_set_background (png_ptr, image_bg,