mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-04 11:40:22 +00:00
Code Issues Releases Activity

Revert "gnus-util: rewrite gnus-rescale-image".

Browse Source
This commit is contained in:
Julien Danjou 2010-12-20 22:12:30 +00:00 committed by Katsumi Yamaoka
parent adc0b79347
commit c486dd9609
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/gnus/ChangeLog
View File

@ -14,11 +14,6 @@
* nnimap.el (nnimap-retrieve-headers): Remove CRLF from the headers.
2010-12-17 Julien Danjou <julien@danjou.info>
* gnus-util.el (gnus-rescale-image): Allow to resize images even if
they are from file. Can also scale up.
2010-12-17 Andrew Cohen <cohen@andy.bu.edu>
* gnus-sum.el (gnus-summary-refer-thread): Simplify code. Restore

21
lisp/gnus/gnus-util.el
View File

@ -1983,16 +1983,21 @@ empty directories from OLD-PATH."
"Rescale IMAGE to SIZE if possible.
SIZE is in format (WIDTH . HEIGHT). Return a new image.
Sizes are in pixels."
(when (fboundp 'imagemagick-types)
(if (or (not (fboundp 'imagemagick-types))
(not (get-buffer-window (current-buffer))))
image
(let ((new-width (car size))
(new-height (cdr size)))
(unless (= (cdr (image-size image t)) new-height)
(setcdr image (plist-put (cdr image) :type 'imagemagick))
(setcdr image (plist-put (cdr image) :height new-height)))
(unless (= (car (image-size image t)) new-width)
(setcdr image (plist-put (cdr image) :type 'imagemagick))
(setcdr image (plist-put (cdr image) :width new-width)))))
image)
(when (> (cdr (image-size image t)) new-height)
(setq image (or (create-image (plist-get (cdr image) :data) 'imagemagick t
:height new-height)
image)))
(when (> (car (image-size image t)) new-width)
(setq image (or
(create-image (plist-get (cdr image) :data) 'imagemagick t
:width new-width)
image)))
image)))
(defun gnus-list-memq-of-list (elements list)
"Return non-nil if any of the members of ELEMENTS are in LIST."