diff options
| author | Juanma Barranquero <lekktu@gmail.com> | 2008-06-27 15:58:36 +0000 |
|---|---|---|
| committer | Juanma Barranquero <lekktu@gmail.com> | 2008-06-27 15:58:36 +0000 |
| commit | 24c23999e1d5352664cbb4d4a8e927efb1ec43b1 (patch) | |
| tree | adc182462e3f364f4475acb826c980b9abc3c983 /lisp/image.el | |
| parent | 9fa1c445a9aa2648d0d87afa1dbf469b2068dc8d (diff) | |
| download | emacs-24c23999e1d5352664cbb4d4a8e927efb1ec43b1.tar.gz | |
(image-jpeg-p): Don't fail if the arg cannot be converted to unibyte.
Just assume it is not a JPEG. Use `string-match-p'.
(image-type-from-data, image-type-from-file-name): Use `string-match-p'.
(image-type-from-buffer): Use `looking-at-p'.
Diffstat (limited to 'lisp/image.el')
| -rw-r--r-- | lisp/image.el | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/lisp/image.el b/lisp/image.el index 7dfa0d4a327..2633ff28310 100644 --- a/lisp/image.el +++ b/lisp/image.el @@ -208,8 +208,8 @@ compatibility with versions of Emacs that lack the variable (defun image-jpeg-p (data) "Value is non-nil if DATA, a string, consists of JFIF image data. We accept the tag Exif because that is the same format." - (setq data (string-to-unibyte data)) - (when (string-match "\\`\xff\xd8" data) + (setq data (ignore-errors (string-to-unibyte data))) + (when (and data (string-match-p "\\`\xff\xd8" data)) (catch 'jfif (let ((len (length data)) (i 2)) (while (< i len) @@ -224,8 +224,8 @@ We accept the tag Exif because that is the same format." (when (and (>= code #xe0) (<= code #xef)) ;; APP0 LEN1 LEN2 "JFIF\0" (throw 'jfif - (string-match "JFIF\\|Exif" - (substring data i (min (+ i nbytes) len))))) + (string-match-p "JFIF\\|Exif" + (substring data i (min (+ i nbytes) len))))) (setq i (+ i 1 nbytes)))))))) @@ -240,7 +240,7 @@ be determined." (let ((regexp (car (car types))) (image-type (cdr (car types)))) (if (or (and (symbolp image-type) - (string-match regexp data)) + (string-match-p regexp data)) (and (consp image-type) (funcall (car image-type) data) (setq image-type (cdr image-type)))) @@ -264,7 +264,7 @@ be determined." (image-type (cdr (car types))) data) (if (or (and (symbolp image-type) - (looking-at regexp)) + (looking-at-p regexp)) (and (consp image-type) (funcall (car image-type) (or data @@ -302,7 +302,7 @@ be determined." "Determine the type of image file FILE from its name. Value is a symbol specifying the image type, or nil if type cannot be determined." - (assoc-default file image-type-file-name-regexps 'string-match)) + (assoc-default file image-type-file-name-regexps 'string-match-p)) ;;;###autoload |