From fdad905ee256c4d160402fa5bffecba0df184e41 Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 15 Aug 2010 20:15:35 +0000 Subject: [PATCH] --- ChangeLog | 4 ++++ wand/compare.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a88f2aa7c..58e47d18b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2010-08-15 6.6.3-6 Cristy + * Throw exception if image size differs for the compare program but the + -subimage-search option is not specified. + 2010-08-13 6.6.3-6 Cristy * The AdobeRgb.tif TIFF image no longer faults under Windows (reference http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16838). diff --git a/wand/compare.c b/wand/compare.c index d5d921b55..ad4aee487 100644 --- a/wand/compare.c +++ b/wand/compare.c @@ -945,7 +945,10 @@ WandExport MagickBooleanType CompareImageCommand(ImageInfo *image_info, difference_image=CompareImageChannels(image,reconstruct_image,channels, metric,&distortion,exception); else - if (similarity_image != (Image *) NULL) + if (similarity_image == (Image *) NULL) + ThrowCompareException(OptionError,"ImageWidthsOrHeightsDiffer", + image->filename) + else { Image *composite_image; -- 2.40.0