Changeset 3001

Timestamp:

02/19/03 20:12:19 (6 years ago)

Author:

miyoshi

Message:

(image-type-from-file-header): Make temporary buffer
unibyte. This code is imported from emacs-21.3.50.

Files:

• work/cvs2svn/lisp/ChangeLog.Meadow (modified) (1 diff)
• work/cvs2svn/lisp/image.el (modified) (3 diffs)

work/cvs2svn/lisp/ChangeLog.Meadow

@@ +1 @@
+2003-02-19  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
+
+        * image.el (image-type-from-file-header): Make temporary buffer
+        unibyte. This code is imported from emacs-21.3.50.
+
-2003-02-12  MIYOSHI Masanori  <miyoshi@boreas.dti.ne.jp>
-

work/cvs2svn/lisp/image.el

@@ -32 +32 @@
-
-(defconst image-type-regexps
-^/
-^
-^
-JFIF" . jpe
-^\211PNG\r\n" . png
-^#define" . xbm
-^\\(MM\0\\*\\)\\|\\(II\\*\0\\)" . tiff
-^%!PS" . postscript
+\\`/[\t\n\r ]*
+\\`
+\\`
+\\`\211PNG\r\n" . pn
+\\`[\t\n\r ]*#define" . xbm
+\\`\\(MM\0\\*\\|II\\*\0\\)" . tiff
+\\`[\t\n\r ]*%!PS" . postscript
+\\`\xff\xd8" . (image-jpeg-p . jpeg)
-  "Alist of (REGEXP . IMAGE-TYPE) pairs used to auto-detect image types.
-When the first bytes of an image file match REGEXP, it is assumed to
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -55 +79 @@
-      (let ((regexp (car (car types)))
-            (image-type (cdr (car types))))
-
+
+
+
+
+
-          (setq type image-type))
-        (setq types (cdr types))))
@@ -70 +98 @@
-  (setq file (expand-file-name file))
-  (let ((header (with-temp-buffer
+                  (set-buffer-multibyte nil)
-                  (insert-file-contents-literally file nil 0 256)
-                  (buffer-string))))