# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1186504341 0
# Node ID 681eb7074f83a94c9652f52c665d9792294c4380
# Parent  65140a5dc349246896884b105fbe0dfe1e613995
* dispextern.h (struct image): New members.

* image.c: Sync to trunk version.
(search_image_cache, uncache_image, image-refresh): New functions.
Check for fg and bg colors.
(lookup_image): Use search_image_cache.  Cache fg and bg colors.
(pbm_load): Another check for invalid image data.
(png_load): Ignore default background field.

diff -r 65140a5dc349 -r 681eb7074f83 src/ChangeLog
--- a/src/ChangeLog	Tue Aug 07 16:08:39 2007 +0000
+++ b/src/ChangeLog	Tue Aug 07 16:32:21 2007 +0000
@@ -1,5 +1,14 @@
 2007-08-07  Chong Yidong  <cyd@stupidchicken.com>
 
+	* dispextern.h (struct image): New members.
+
+	* image.c: Sync to trunk version.
+	(search_image_cache, uncache_image, image-refresh): New functions.
+	Check for fg and bg colors.
+	(lookup_image): Use search_image_cache.  Cache fg and bg colors.
+	(pbm_load): Another check for invalid image data.
+	(png_load): Ignore default background field.
+
 	* xdisp.c (move_it_by_lines): Remove incorrect optimization.
 
 2007-08-07  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>