diff options
| author | Paul Eggert | 2011-07-29 00:05:17 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-07-29 00:05:17 -0700 |
| commit | e5d76069f08b5ccb5d10edd5242b363fd92aacac (patch) | |
| tree | 2e1aa6bcdabf56c63162ce5fab80639ef7c16ec3 /src/image.c | |
| parent | 29c8a348c5c9f326af54a3d30f69cde98fe300bb (diff) | |
| download | emacs-e5d76069f08b5ccb5d10edd5242b363fd92aacac.tar.gz emacs-e5d76069f08b5ccb5d10edd5242b363fd92aacac.zip | |
* image.c (check_image_size): Use 1024x1024 if unknown frame (Bug#9189).
This is needed if max-image-size is a floating-point number.
Diffstat (limited to 'src/image.c')
| -rw-r--r-- | src/image.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/image.c b/src/image.c index fb1d825fa54..d1091aec6f3 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -1053,9 +1053,13 @@ check_image_size (struct frame *f, int width, int height) | |||
| 1053 | && height <= XINT (Vmax_image_size)); | 1053 | && height <= XINT (Vmax_image_size)); |
| 1054 | else if (FLOATP (Vmax_image_size)) | 1054 | else if (FLOATP (Vmax_image_size)) |
| 1055 | { | 1055 | { |
| 1056 | xassert (f); | 1056 | if (f != NULL) |
| 1057 | w = FRAME_PIXEL_WIDTH (f); | 1057 | { |
| 1058 | h = FRAME_PIXEL_HEIGHT (f); | 1058 | w = FRAME_PIXEL_WIDTH (f); |
| 1059 | h = FRAME_PIXEL_HEIGHT (f); | ||
| 1060 | } | ||
| 1061 | else | ||
| 1062 | w = h = 1024; /* Arbitrary size for unknown frame. */ | ||
| 1059 | return (width <= XFLOAT_DATA (Vmax_image_size) * w | 1063 | return (width <= XFLOAT_DATA (Vmax_image_size) * w |
| 1060 | && height <= XFLOAT_DATA (Vmax_image_size) * h); | 1064 | && height <= XFLOAT_DATA (Vmax_image_size) * h); |
| 1061 | } | 1065 | } |