[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/image-dired.el,v
From: |
Glenn Morris |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/image-dired.el,v |
Date: |
Wed, 25 Apr 2007 04:58:15 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: Glenn Morris <gm> 07/04/25 04:58:14
Index: image-dired.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/image-dired.el,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- image-dired.el 22 Apr 2007 13:44:05 -0000 1.1
+++ image-dired.el 25 Apr 2007 04:58:14 -0000 1.2
@@ -1774,7 +1774,8 @@
If optional argument ORIGINAL-SIZE is non-nil, display image in its
original size."
(let ((new-file (expand-file-name image-dired-temp-image-file))
- width height command ret)
+ width height command ret
+ (image-type 'jpeg))
(setq file (expand-file-name file))
(if (not original-size)
(progn
@@ -1793,12 +1794,13 @@
shell-command-switch command))
(if (not (= 0 ret))
(error "Could not resize image")))
+ (setq image-type (image-type-from-file-name file))
(copy-file file new-file t))
(with-current-buffer (image-dired-create-display-image-buffer)
(let ((inhibit-read-only t))
(erase-buffer)
(clear-image-cache)
- (image-dired-insert-image image-dired-temp-image-file 'jpeg 0 0)
+ (image-dired-insert-image image-dired-temp-image-file image-type 0 0)
(goto-char (point-min))
(image-dired-update-property 'original-file-name file)))))
- [Emacs-diffs] Changes to emacs/lisp/image-dired.el,v,
Glenn Morris <=