[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3756739: Allow passing in max-width/height
From: |
Lars Ingebrigtsen |
Subject: |
[Emacs-diffs] master 3756739: Allow passing in max-width/height |
Date: |
Tue, 24 Jan 2017 20:17:49 +0000 (UTC) |
branch: master
commit 37567393a033f3feeec3d6ace30fa2dcd0419e26
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>
Allow passing in max-width/height
* lisp/net/shr.el (shr-rescale-image): Allow passing in
max-width/height (bug#25287).
---
lisp/net/shr.el | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index e0bb3db..1c2ea3c 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -1011,18 +1011,25 @@ element is the data blob and the second element is the
content-type."
image)
(insert (or alt ""))))
-(defun shr-rescale-image (data content-type width height)
+(defun shr-rescale-image (data content-type width height
+ &optional max-width max-height)
"Rescale DATA, if too big, to fit the current buffer.
-WIDTH and HEIGHT are the sizes given in the HTML data, if any."
+WIDTH and HEIGHT are the sizes given in the HTML data, if any.
+
+The size of the displayed image will not exceed
+MAX-WIDTH/MAX-HEIGHT. If not given, use the current window
+width/height instead."
(if (or (not (fboundp 'imagemagick-types))
(not (get-buffer-window (current-buffer))))
(create-image data nil t :ascent 100)
(let* ((edges (window-inside-pixel-edges
(get-buffer-window (current-buffer))))
(max-width (truncate (* shr-max-image-proportion
- (- (nth 2 edges) (nth 0 edges)))))
+ (or max-width
+ (- (nth 2 edges) (nth 0 edges))))))
(max-height (truncate (* shr-max-image-proportion
- (- (nth 3 edges) (nth 1 edges)))))
+ (or max-height
+ (- (nth 3 edges) (nth 1 edges))))))
(scaling (image-compute-scaling-factor image-scaling-factor)))
(when (or (and width
(> width max-width))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 3756739: Allow passing in max-width/height,
Lars Ingebrigtsen <=