* image.c (xbm_read_bitmap_data): New arg inhibit_image_error.

(xbm_load_image): Caller changed.
(xbm_file_p): Avoid signalling an image_error.

2 files changed, 18 insertions, 8 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 4e32fe46bec..23d117d5dc3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-08-13  Chong Yidong  <cyd@stupidchicken.com>
+
+        * image.c (xbm_read_bitmap_data): New arg inhibit_image_error.
+        (xbm_load_image): Caller changed.
+        (xbm_file_p): Avoid signalling an image_error.
+
 2009-08-13  Nick Roberts  <nickrob@snap.net.nz>
 
         * process.c (create_pty): New function.
diff --git a/src/image.c b/src/image.c
index fa8c3ea9cda..e10f3817b69 100644
--- a/src/image.c
+++ b/src/image.c
@@ -2543,7 +2543,7 @@ static int xbm_load_image P_ ((struct frame *f, struct image *img,
 static int xbm_image_p P_ ((Lisp_Object object));
 static int xbm_read_bitmap_data P_ ((struct frame *f,
                                      unsigned char *, unsigned char *,
-                                     int *, int *, unsigned char **));
+                                     int *, int *, unsigned char **, int));
 static int xbm_file_p P_ ((Lisp_Object));
 
 
@@ -2934,14 +2934,17 @@ Create_Pixmap_From_Bitmap_Data (f, img, data, fg, bg, non_default_colors)
    buffer's end.  Set *WIDTH and *HEIGHT to the width and height of
    the image.  Return in *DATA the bitmap data allocated with xmalloc.
    Value is non-zero if successful.  DATA null means just test if
-   CONTENTS looks like an in-memory XBM file.  */
+   CONTENTS looks like an in-memory XBM file.  If INHIBIT_IMAGE_ERROR
+   is non-zero, inhibit the call to image_error when the image size is
+   invalid (the bitmap remains unread).  */
 
 static int
-xbm_read_bitmap_data (f, contents, end, width, height, data)
+xbm_read_bitmap_data (f, contents, end, width, height, data, inhibit_image_error)
      struct frame *f;
      unsigned char *contents, *end;
      int *width, *height;
      unsigned char **data;
+     int inhibit_image_error;
 {
   unsigned char *s = contents;
   char buffer[BUFSIZ];
@@ -2993,7 +2996,8 @@ xbm_read_bitmap_data (f, contents, end, width, height, data)
 
   if (!check_image_size (f, *width, *height))
     {
-      image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
+      if (!inhibit_image_error)
+        image_error ("Invalid image size (see `max-image-size')", Qnil, Qnil);
       goto failure;
     }
   else if (data == NULL)
@@ -3098,7 +3102,8 @@ xbm_load_image (f, img, contents, end)
   unsigned char *data;
   int success_p = 0;
 
-  rc = xbm_read_bitmap_data (f, contents, end, &img->width, &img->height, &data);
+  rc = xbm_read_bitmap_data (f, contents, end, &img->width, &img->height,
+                             &data, 0);
   if (rc)
     {
       unsigned long foreground = FRAME_FOREGROUND_PIXEL (f);
@@ -3153,9 +3158,8 @@ xbm_file_p (data)
   int w, h;
   return (STRINGP (data)
           && xbm_read_bitmap_data (NULL, SDATA (data),
-                                   (SDATA (data)
-                                    + SBYTES (data)),
-                                   &w, &h, NULL));
+                                   (SDATA (data) + SBYTES (data)),
+                                   &w, &h, NULL, 1));
 }