]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Fri, 15 Mar 2013 18:24:00 +0000 (18:24 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Fri, 15 Mar 2013 18:24:00 +0000 (18:24 +0000)
MagickCore/compare.c

index 05d934c1ba1e9e2511f2f78bd689e45e77c907ba..2f71c53915cd665780c5b4efd41b5a8b8775af48 100644 (file)
@@ -1618,6 +1618,8 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
 
     if (status == MagickFalse)
       continue;
+    if (*similarity_metric <= similarity_threshold)
+      continue;
     q=GetCacheViewAuthenticPixels(similarity_view,0,y,similarity_image->columns,
       1,exception);
     if (q == (Quantum *) NULL)
@@ -1630,15 +1632,17 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
       register ssize_t
         i;
 
+      if (*similarity_metric <= similarity_threshold)
+        break;
       similarity=GetSimilarityMetric(image,reference,metric,x,y,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
       #pragma omp critical (MagickCore_SimilarityImage)
 #endif
       if (similarity < *similarity_metric)
         {
-          *similarity_metric=similarity;
           offset->x=x;
           offset->y=y;
+          *similarity_metric=similarity;
         }
       if (GetPixelMask(similarity_image,q) != 0)
         {