# HG changeset patch
# User Jason Rumney <jasonr@gnu.org>
# Date 1200316768 0
# Node ID f4af1399e6f64ba692d7bed86b7de2d0a5b24d4b
# Parent  59059317a011cc489b610bebd65bb27b462309f1
(image-type): Use image-type-from-file-name (from trunk
2007-05-21  Chong Yidong  <cyd@stupidchicken.com>).

diff -r 59059317a011 -r f4af1399e6f6 lisp/image.el
--- a/lisp/image.el	Sat Jan 12 23:21:43 2008 +0000
+++ b/lisp/image.el	Mon Jan 14 13:19:28 2008 +0000
@@ -313,22 +313,14 @@
 Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data."
   (when (and (not data-p) (not (stringp file-or-data)))
     (error "Invalid image file name `%s'" file-or-data))
-  (cond ((null data-p)
-	 ;; FILE-OR-DATA is a file name.
-	 (unless (or type
-		     (setq type (image-type-from-file-header file-or-data)))
-	   (let ((extension (file-name-extension file-or-data)))
-	     (unless extension
-	       (error "Cannot determine image type"))
-	     (setq type (intern extension)))))
-	(t
-	 ;; FILE-OR-DATA contains image data.
-	 (unless type
-	   (setq type (image-type-from-data file-or-data)))))
   (unless type
-    (error "Cannot determine image type"))
-  (unless (symbolp type)
-    (error "Invalid image type `%s'" type))
+    (setq type (if data-p 
+                   (image-type-from-data file-or-data)
+                 (or (image-type-from-file-header file-or-data)
+                     (image-type-from-file-name file-or-data))))
+    (or type(error "Cannot determine image type")))
+  (or (memq type (and (boundp 'image-types) image-types))
+      (error "Invalid image type `%s'" type))
   type)