diff options
| author | Lars Ingebrigtsen <larsi@gnus.org> | 2016-05-14 22:57:36 +0200 |
|---|---|---|
| committer | Lars Ingebrigtsen <larsi@gnus.org> | 2016-05-14 22:57:53 +0200 |
| commit | f2b16e44721a07c59279e91d7cd34777fa30fbdf (patch) | |
| tree | f2304ff4b3c925402237c3892a908fb3e8532393 | |
| parent | bed76a80d518dfc64980d950963ebf01a956cc80 (diff) | |
| download | emacs-f2b16e44721a07c59279e91d7cd34777fa30fbdf.tar.gz | |
:max-width/height fixes for shr after the scaling changes
* lisp/net/shr.el (shr-rescale-image): Ensure that we respect
max-width and max-height even after the scaling changes done
earlier this year.
| -rw-r--r-- | lisp/net/shr.el | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/net/shr.el b/lisp/net/shr.el index d91b00ca77d..9d42fde0756 100644 --- a/lisp/net/shr.el +++ b/lisp/net/shr.el @@ -1016,14 +1016,17 @@ WIDTH and HEIGHT are the sizes given in the HTML data, if any." (max-width (truncate (* shr-max-image-proportion (- (nth 2 edges) (nth 0 edges))))) (max-height (truncate (* shr-max-image-proportion - (- (nth 3 edges) (nth 1 edges)))))) + (- (nth 3 edges) (nth 1 edges))))) + (scaling (image-compute-scaling-factor image-scaling-factor))) (when (or (and width (> width max-width)) (and height (> height max-height))) (setq width nil height nil)) - (if (and width height) + (if (and width height + (< (* width scaling) max-width) + (< (* height scaling) max-height)) (create-image data 'imagemagick t :ascent 100 |