comparison lisp/image.el @ 74916:03827985fb39

(image-type-header-regexps): Change element format to include third item NOT-ALWAYS. (image-type-from-data): Handle new format. (image-type-from-buffer): Handle new format. New arg INCLUDE-MAYBES. (image-type-from-file-header): Pass t for INCLUDE-MAYBES.

74915:77a25925b486

  "Image support."
  :group 'multimedia)


(defconst image-type-header-regexps
  '(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" . xpm)
    ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" . pbm)
    ("\\`GIF8" . gif)
    ("\\`\x89PNG\r\n\x1a\n" . png)
    ("\\`[\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
be of image type IMAGE-TYPE if IMAGE-TYPE is a symbol.  If not a symbol,
IMAGE-TYPE must be a pair (PREDICATE . TYPE).  PREDICATE is called
with one argument, a string containing the image data.  If PREDICATE returns
a non-nil value, TYPE is the image's type.")

(defconst image-type-file-name-regexps
  '(("\\.png\\'" . png)
    ("\\.gif\\'" . gif)
    ("\\.jpe?g\\'" . jpeg)

be determined."
  (let ((types image-type-header-regexps)
	type)
    (while types
      (let ((regexp (car (car types)))
	    (image-type (cdr (car types))))
	(if (or (and (symbolp image-type)
		     (string-match regexp data))
		(and (consp image-type)
		     (funcall (car image-type) data)
		     (setq image-type (cdr image-type))))

	  (setq types (cdr types)))))
    type))


;;;###autoload
(defun image-type-from-buffer ()
  "Determine the image type from data in the current buffer.
Value is a symbol specifying the image type or nil if type cannot
be determined."
  (let ((types image-type-header-regexps)
	type
	(opoint (point)))
    (goto-char (point-min))
    (while types
      (let ((regexp (car (car types)))
	    (image-type (cdr (car types)))
	    data)
	(if (or (and (symbolp image-type)
		     (looking-at regexp))
		(and (consp image-type)
		     (funcall (car image-type)

					(buffer-substring
					 (point-min)
					 (min (point-max)
					      (+ (point-min) 256))))))
		     (setq image-type (cdr image-type))))
	    (setq type image-type
		  types nil)
	  (setq types (cdr types)))))
    (goto-char opoint)
    type))

  (and file
       (file-readable-p file)
       (with-temp-buffer
	 (set-buffer-multibyte nil)
	 (insert-file-contents-literally file nil 0 256)
	 (image-type-from-buffer))))


;;;###autoload
(defun image-type-from-file-name (file)
  "Determine the type of image file FILE from its name.

74916:03827985fb39

  "Image support."
  :group 'multimedia)


(defconst image-type-header-regexps
  '(("\\`/[\t\n\r ]*\\*.*XPM.\\*/" xpm)
    ("\\`P[1-6][[:space:]]+\\(?:#.*[[:space:]]+\\)*[0-9]+[[:space:]]+[0-9]+" pbm)
    ("\\`GIF8" gif)
    ("\\`\x89PNG\r\n\x1a\n" png)
    ("\\`[\t\n\r ]*#define" xbm)
    ("\\`\\(?:MM\0\\*\\|II\\*\0\\)" tiff)
    ("\\`[\t\n\r ]*%!PS" postscript t)
    ("\\`\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
be of image type IMAGE-TYPE if IMAGE-TYPE is a symbol.

An element can also be (REGEXP IMAGE-TYPE NOT-ALWAYS).  If
NOT-ALWAYS is non-nil, that means that REGEXP identifies a
file that _can_ be treated as an image of type IMAGE-TYPE,
but such files should not be spontaneously treated as images.

IMAGE-TYPE can be a pair (PREDICATE . TYPE) instead of a
symbol.  Then PREDICATE is called with one argument, a
string containing the image data.  If PREDICATE returns a
non-nil value, TYPE is the image's type.")

(defconst image-type-file-name-regexps
  '(("\\.png\\'" . png)
    ("\\.gif\\'" . gif)
    ("\\.jpe?g\\'" . jpeg)

be determined."
  (let ((types image-type-header-regexps)
	type)
    (while types
      (let ((regexp (car (car types)))
	    (image-type (nth 1 (car types))))
	(if (or (and (symbolp image-type)
		     (string-match regexp data))
		(and (consp image-type)
		     (funcall (car image-type) data)
		     (setq image-type (cdr image-type))))

	  (setq types (cdr types)))))
    type))


;;;###autoload
(defun image-type-from-buffer (&optional include-maybes)
  "Determine the image type from data in the current buffer.
Value is a symbol specifying the image type, or nil if none
corresponds to the buffer contents.

If INCLUDE-MAYBES is nil (the default), we return nil for 
file types that should not always be treated as images
even though they can be so treated."
  (let ((types image-type-header-regexps)
	type
	(opoint (point)))
    (goto-char (point-min))
    (while types
      (let ((regexp (car (car types)))
	    (image-type (nth 1 (car types)))
	    (not-always (nth 2 (car types)))
	    data)
	(if (or (and (symbolp image-type)
		     (looking-at regexp))
		(and (consp image-type)
		     (funcall (car image-type)

					(buffer-substring
					 (point-min)
					 (min (point-max)
					      (+ (point-min) 256))))))
		     (setq image-type (cdr image-type))))
	    ;; If this entry says "not always",
	    ;; treat it as nil, unless INCLUDE-MAYBES is t.
	    (setq type (if (or include-maybes (not not-always))
			   image-type)
		  types nil)
	  (setq types (cdr types)))))
    (goto-char opoint)
    type))

  (and file
       (file-readable-p file)
       (with-temp-buffer
	 (set-buffer-multibyte nil)
	 (insert-file-contents-literally file nil 0 256)
	 (image-type-from-buffer t))))


;;;###autoload
(defun image-type-from-file-name (file)
  "Determine the type of image file FILE from its name.