(image-jpeg-p): Test for APPn markers in the range

#xe0..#xef.
This commit is contained in:
Gerd Moellmann 2001-08-10 10:59:06 +00:00
parent 5d7a37fa13
commit 4a9bf8a43f
2 changed files with 10 additions and 4 deletions

View file

@ -1,3 +1,8 @@
2001-08-10 Gerd Moellmann <gerd@gnu.org>
* image.el (image-jpeg-p): Test for APPn markers in the range
#xe0..#xef.
2001-08-09 Gerd Moellmann <gerd@gnu.org>
* desktop.el (desktop-save): Don't use concat to form a file

View file

@ -59,11 +59,12 @@ a non-nil value, TYPE is the image's type ")
(when (>= (+ i 2) len)
(throw 'jfif nil))
(let ((nbytes (+ (lsh (aref data (+ i 1)) 8)
(aref data (+ i 2)))))
(when (= (aref data i) #xe0)
(aref data (+ i 2))))
(code (aref data i)))
(when (and (>= code #xe0) (<= code #xef))
;; APP0 LEN1 LEN2 "JFIF\0"
(throw 'jfif (string-match "\\`\xe0..JFIF\0"
(substring data i (+ i 10)))))
(throw 'jfif
(string-match "JFIF" (substring data i nbytes))))
(setq i (+ i 1 nbytes))))))))