(no commit message)

diff --git a/ChangeLog b/ChangeLog
index a88f2aa7c168f19c584e354c69b338c5e7e17e78..58e47d18b6b7b73f6529ec70f12c0ce140412ce1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-08-15  6.6.3-6 Cristy  <quetzlzacatenango@image...>
+  * 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  <quetzlzacatenango@image...>
   * 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 d5d921b553c1add7a787133ac78ee588381bdfb6..ad4aee4875cf0cce87432474849d1e2665827f8e 100644 (file)
--- 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;