From: Paul Eggert <eggert@cs.ucla.edu>
Date: Sat, 23 Jan 2016 09:40:29 +0000 (-0800)
Subject: Report error for PNG under Cairo
X-Git-Tag: emacs-25.0.90~81
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=190d365f90d741b09e817d9878afd256505e1944;p=emacs.git

Report error for PNG under Cairo

* src/image.c (lookup_rgb_color): Signal a file error instead
of dumping core when mishandling an image.
---

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)
 #elif defined HAVE_NS
   return RGB_TO_ULONG (r >> 8, g >> 8, b >> 8);
 #else
-  eassume (false);
+  xsignal1 (Qfile_error,
+	    build_string ("This Emacs mishandles this image file type"));
 #endif
 }