[Emacs-diffs] /srv/bzr/emacs/trunk r105352: * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189).

[Paul Eggert]

------------------------------------------------------------
revno: 105352
fixes bug(s): http://debbugs.gnu.org/9189
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Fri 2011-07-29 00:05:17 -0700
message:
  * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189).
  
  This is needed if max-image-size is a floating-point number.
modified:
  src/ChangeLog
  src/image.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-07-28 20:23:19 +0000
+++ b/src/ChangeLog     2011-07-29 07:05:17 +0000
@@ -1,3 +1,8 @@
+2011-07-29  Paul Eggert  <address@hidden>
+
+       * image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189).
+       This is needed if max-image-size is a floating-point number.
+
 2011-07-28  Andreas Schwab  <address@hidden>
 
        * print.c (print_object): Print empty symbol as ##.

=== modified file 'src/image.c'
--- a/src/image.c       2011-07-28 09:40:05 +0000
+++ b/src/image.c       2011-07-29 07:05:17 +0000
@@ -1053,9 +1053,13 @@
            && height <= XINT (Vmax_image_size));
   else if (FLOATP (Vmax_image_size))
     {
-      xassert (f);
-      w = FRAME_PIXEL_WIDTH (f);
-      h = FRAME_PIXEL_HEIGHT (f);
+      if (f != NULL)
+       {
+         w = FRAME_PIXEL_WIDTH (f);
+         h = FRAME_PIXEL_HEIGHT (f);
+       }
+      else
+       w = h = 1024;  /* Arbitrary size for unknown frame. */
       return (width <= XFLOAT_DATA (Vmax_image_size) * w
              && height <= XFLOAT_DATA (Vmax_image_size) * h);
     }