summaryrefslogtreecommitdiff
path: root/lisp/image.el
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/image.el')
-rw-r--r--lisp/image.el5
1 files changed, 3 insertions, 2 deletions
diff --git a/lisp/image.el b/lisp/image.el
index 32df508bc8d..ed32307ae24 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -976,11 +976,12 @@ default is 20%."
image))
(defun image--get-imagemagick-and-warn ()
- (unless (fboundp 'imagemagick-types)
+ (unless (or (fboundp 'imagemagick-types) (featurep 'ns))
(error "Can't rescale images without ImageMagick support"))
(let ((image (image--get-image)))
(image-flush image)
- (plist-put (cdr image) :type 'imagemagick)
+ (when (fboundp 'imagemagick-types)
+ (plist-put (cdr image) :type 'imagemagick))
image))
(defun image--change-size (factor)