(no commit message)

diff --git a/ChangeLog b/ChangeLog
index 67d75570513d9e507a9dfcb303c703ac1a57cfbb..a88f2aa7c168f19c584e354c69b338c5e7e17e78 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
 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).
+  * Add -subimage-search option to the compare utility.
 
 2010-08-12  6.6.3-5 Cristy  <quetzlzacatenango@image...>
   * The -fx 2e+6/1e+5 argument no longer returns the wrong results (reference
@@ -18,7 +19,6 @@
   * Return proper standard deviation for combined channels (reference
     http://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=16786).
   * Handle transparency properly for the PSD image format.
-  * Add -subimage-search option to the compare utility.
 
 2010-08-05  6.6.3-3 Glenn Randers-Pehrson <glennrp@image...>
   * Properly map PNG intent to image->rendering_intent

diff --git a/magick/compare.c b/magick/compare.c
index 51b43aa4a0482e72152256f3a7992a28f4008d5f..24e7016149f9a633464c080d058ca9bd3ab54aa2 100644 (file)
--- a/magick/compare.c
+++ b/magick/compare.c
@@ -1404,9 +1404,6 @@ static double GetSimilarityMetric(const Image *image,const Image *reference,
   similarity=0.0;
   image_view=AcquireCacheView(image);
   reference_view=AcquireCacheView(reference);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(dynamic,4) shared(status)
-#endif
   for (y=0; y < (ssize_t) reference->rows; y++)
   {
     register const IndexPacket
@@ -1460,9 +1457,6 @@ static double GetSimilarityMetric(const Image *image,const Image *reference,
             reference_indexes[x]);
           thread_similarity+=distance*distance;
         }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp critical (MagickCore_GetSimilarityMetric)
-#endif
       similarity+=thread_similarity;
       p++;
       q++;
@@ -1506,8 +1500,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
   assert(offset != (RectangleInfo *) NULL);
   SetGeometry(reference,offset);
   *similarity_metric=1.0;
-  if ((reference->columns > image->columns) ||
-      (reference->rows > image->rows))
+  if ((reference->columns > image->columns) || (reference->rows > image->rows))
     ThrowImageException(ImageError,"ImageSizeDiffers");
   similarity_image=CloneImage(image,image->columns-reference->columns+1,
     image->rows-reference->rows+1,MagickTrue,exception);