From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 1 Mar 2013 14:22:42 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4154
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b979cea3643d3a969ba1ee39b6318b8179acd6d3;p=imagemagick

---

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 5757dc3f1..746dc48b3 100644
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -1591,6 +1591,8 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
       similarity_image=DestroyImage(similarity_image);
       return((Image *) NULL);
     }
+  (void) SetImageAlphaChannel(similarity_image,DeactivateAlphaChannel,
+    exception);
   /*
     Measure similarity of reference image against image.
   */
@@ -1656,15 +1658,19 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
       }
       q+=GetPixelChannels(similarity_image);
     }
-    if (IfMagickFalse( SyncCacheViewAuthenticPixels(similarity_view,exception) ))
+    if (SyncCacheViewAuthenticPixels(similarity_view,exception) == MagickFalse)
       status=MagickFalse;
     if (image->progress_monitor != (MagickProgressMonitor) NULL)
       {
+        MagickBooleanType
+          proceed;
+
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
         #pragma omp critical (MagickCore_SimilarityImage)
 #endif
-        if (IfMagickFalse(SetImageProgress(image,SimilarityImageTag,
-                 progress++,image->rows) ))
+        proceed=SetImageProgress(image,SimilarityImageTag,progress++,
+          image->rows);
+        if (proceed == MagickFalse)
           status=MagickFalse;
       }
   }