mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-12 16:23:57 +00:00
Code Issues Releases Activity

:max-width/height fixes for shr after the scaling changes

Browse Source 
* 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.
This commit is contained in:
Lars Ingebrigtsen 2016-05-14 22:57:36 +02:00
parent bed76a80d5
commit f2b16e4472
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/net/shr.el
View File

@ -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