diff options
| author | Paul Eggert | 2016-01-23 01:40:29 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-01-23 01:40:49 -0800 |
| commit | 190d365f90d741b09e817d9878afd256505e1944 (patch) | |
| tree | 6968d53e799aecdf47f7d718e113aed127fe78da /src | |
| parent | 5c3edcd75356bab9e36f0b183584a9b9302e2f0c (diff) | |
| download | emacs-190d365f90d741b09e817d9878afd256505e1944.tar.gz emacs-190d365f90d741b09e817d9878afd256505e1944.zip | |
Report error for PNG under Cairo
* src/image.c (lookup_rgb_color): Signal a file error instead
of dumping core when mishandling an image.
Diffstat (limited to 'src')
| -rw-r--r-- | src/image.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/image.c b/src/image.c index 4681cba1f87..144fe30a746 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -4615,7 +4615,8 @@ lookup_rgb_color (struct frame *f, int r, int g, int b) | |||
| 4615 | #elif defined HAVE_NS | 4615 | #elif defined HAVE_NS |
| 4616 | return RGB_TO_ULONG (r >> 8, g >> 8, b >> 8); | 4616 | return RGB_TO_ULONG (r >> 8, g >> 8, b >> 8); |
| 4617 | #else | 4617 | #else |
| 4618 | eassume (false); | 4618 | xsignal1 (Qfile_error, |
| 4619 | build_string ("This Emacs mishandles this image file type")); | ||
| 4619 | #endif | 4620 | #endif |
| 4620 | } | 4621 | } |
| 4621 | 4622 | ||