Implement :max-width/:max-height for (ImageMagic) images

* doc/lispref/display.texi (ImageMagick Images): Mention :max-width and
:max-height.

* lisp/net/shr.el (shr-rescale-image): Use the new
:max-width/:max-height functionality.

* src/image.c (compute_image_size): New function to implement
:max-width and :max-height.
(imagemagick_load_image): Use it.

1 files changed, 3 insertions, 0 deletions

diff --git a/etc/NEWS b/etc/NEWS
index 475b4b26fdb..d7364542ce1 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -695,6 +695,9 @@ ImageMagick types are treated as images.  The function
 `imagemagick-filter-types' returns the list of types that will be
 treated as images.
 
+*** ImageMagick images now support the :max-width and :max-height
+keywords.
+
 ** Minibuffer
 
 *** In minibuffer filename prompts, `C-M-f' and `C-M-b' now move to the