From 2ad29ed09ea9b08734b092dcafce5d4cfd3f460d Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 27 Apr 2020 17:03:18 +0100
Subject: [PATCH] better error msg in magicksave

---
 libvips/foreign/magick.c     | 11 +++++++++--
 libvips/foreign/magicksave.c |  4 +++-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/libvips/foreign/magick.c b/libvips/foreign/magick.c
index 3825744d..642e8b68 100644
--- a/libvips/foreign/magick.c
+++ b/libvips/foreign/magick.c
@@ -287,10 +287,17 @@ int
 magick_set_image_size( Image *image, const size_t width, const size_t height,
 	ExceptionInfo *exception )
 {
-	(void) exception;
 #ifdef HAVE_SETIMAGEEXTENT
-	return( SetImageExtent( image, width, height ) );
+	int result = SetImageExtent( image, width, height );
+
+	/* IM6 sets the exception on the image.
+	 */
+	if( !result )
+		magick_inherit_exception( exception, image );
+
+	return( result ); 
 #else /*!HAVE_SETIMAGEEXTENT*/
+	(void) exception;
 	image->columns = width;
 	image->rows = height;
 
diff --git a/libvips/foreign/magicksave.c b/libvips/foreign/magicksave.c
index 10086d61..102252d9 100644
--- a/libvips/foreign/magicksave.c
+++ b/libvips/foreign/magicksave.c
@@ -149,8 +149,10 @@ vips_foreign_save_magick_next_image( VipsForeignSaveMagick *magick )
 	}
 
 	if( !magick_set_image_size( image, 
-		im->Xsize, magick->page_height, magick->exception ) )
+		im->Xsize, magick->page_height, magick->exception ) ) {
+		magick_vips_error( class->nickname, magick->exception ); 
 		return( -1 );
+	}
 
 	/* Delay must be converted from milliseconds into centiseconds
 	 * as GIF image requires centiseconds.