andros/emacs-gpu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(image-type): Use image-type-from-file-name (from trunk

Browse source 
2007-05-21  Chong Yidong  <cyd@stupidchicken.com>).
This commit is contained in:
Jason Rumney 2008-01-14 13:20:31 +00:00
parent 2769422068
commit f6f844ab24
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lisp/ChangeLog
View file

@ -1,3 +1,8 @@
2008-01-14 Jason Rumney <jasonr@gnu.org>
* image.el (image-type): Use image-type-from-file-name (from trunk
2007-05-21 Chong Yidong <cyd@stupidchicken.com>).
2008-01-12 Glenn Morris <rgm@gnu.org>
* woman.el (woman-parse-numeric-arg): Change handling of `==':

22
lisp/image.el
View file

@ -313,22 +313,14 @@ use its file extension as image type.
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)