(no commit message)

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index b43cb3458e119a0f1e7fc3b68ef219862c8df772..75153b2a89526fd6d96ac1f6f74d724a62575e68 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -4146,8 +4146,8 @@ MagickExport MagickBooleanType DrawPrimitive(Image *image,
         draw_info->affine.tx,draw_info->affine.ty);
     }
   if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
-      ((IsPixelGray(&draw_info->fill) == MagickFalse) ||
-       (IsPixelGray(&draw_info->stroke) == MagickFalse)))
+      ((IsPixelInfoGray(&draw_info->fill) == MagickFalse) ||
+       (IsPixelInfoGray(&draw_info->stroke) == MagickFalse)))
     (void) TransformImageColorspace(image,sRGBColorspace,exception);
   status=MagickTrue;
   x=(ssize_t) ceil(primitive_info->point.x-0.5);

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 0412cf85f204c523ed9c65b1b86a973a11e5e5e4..709a6fdf8062e161f20b061025cfd60e339b492d 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -701,7 +701,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
       return((Image *) NULL);
     }
   if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
-      (IsPixelGray(&colorize) != MagickFalse))
+      (IsPixelInfoGray(colorize) != MagickFalse))
     (void) SetImageColorspace(colorize_image,sRGBColorspace,exception);
   if ((colorize_image->alpha_trait != BlendPixelTrait) &&
       (colorize->alpha_trait == BlendPixelTrait))
@@ -5247,7 +5247,7 @@ MagickExport Image *TintImage(const Image *image,const char *blend,
       return((Image *) NULL);
     }
   if ((IsGrayColorspace(image->colorspace) != MagickFalse) &&
-      (IsPixelGray(&tint) == MagickFalse))
+      (IsPixelInfoGray(tint) == MagickFalse))
     (void) SetImageColorspace(tint_image,sRGBColorspace,exception);
   if (blend == (const char *) NULL)
     return(tint_image);

diff --git a/MagickWand/compare.c b/MagickWand/compare.c
index 44d49fe96f03734eb325ed82bd245949bdabe547..80d54e57becfb053fe5e35c51367bd1491dee99b 100644 (file)
--- a/MagickWand/compare.c
+++ b/MagickWand/compare.c
@@ -213,7 +213,8 @@ WandExport MagickBooleanType CompareImagesCommand(ImageInfo *image_info,
   double
     dissimilarity_threshold,
     distortion,
-    similarity_metric;
+    similarity_metric,
+    similarity_threshold;
 
   Image
     *difference_image,

diff --git a/MagickWand/magick-image.c b/MagickWand/magick-image.c
index 94c0f526ad23734c3d72baeee3c9209474e69d71..a5c9abeff3446888d23d537353384bb6e1b84fa1 100644 (file)
--- a/MagickWand/magick-image.c
+++ b/MagickWand/magick-image.c
@@ -10739,7 +10739,8 @@ WandExport MagickBooleanType MagickSigmoidalContrastImage(
 %
 %      MagickWand *MagickSimilarityImage(MagickWand *wand,
 %        const MagickWand *reference,const MetricType metric,
-%        RectangeInfo *offset,double *similarity)
+%        const double similarity_threshold,RectangeInfo *offset,
+%        double *similarity)
 %
 %  A description of each parameter follows:
 %
@@ -10749,14 +10750,16 @@ WandExport MagickBooleanType MagickSigmoidalContrastImage(
 %
 %    o metric: the metric.
 %
+%    o similarity_threshold: minimum distortion for (sub)image match.
+%
 %    o offset: the best match offset of the reference image within the image.
 %
 %    o similarity: the computed similarity between the images.
 %
 */
 WandExport MagickWand *MagickSimilarityImage(MagickWand *wand,
-  const MagickWand *reference,const MetricType metric,RectangleInfo *offset,
-  double *similarity)
+  const MagickWand *reference,const MetricType metric,
+  const double similarity_threshold,RectangleInfo *offset,double *similarity)
 {
   Image
     *similarity_image;
@@ -10771,8 +10774,8 @@ WandExport MagickWand *MagickSimilarityImage(MagickWand *wand,
         "ContainsNoImages","`%s'",wand->name);
       return((MagickWand *) NULL);
     }
-  similarity_image=SimilarityImage(wand->images,reference->images,metric,offset,
-    similarity,wand->exception);
+  similarity_image=SimilarityImage(wand->images,reference->images,metric,
+    similarity_threshold,offset,similarity,wand->exception);
   if (similarity_image == (Image *) NULL)
     return((MagickWand *) NULL);
   return(CloneMagickWandFromImages(wand,similarity_image));

diff --git a/MagickWand/magick-image.h b/MagickWand/magick-image.h
index 2128251ac7512006554fc23cd8ae00c162d5fa8b..596cb94be0148f385d8686dcb10b983c79fd20ab 100644 (file)
--- a/MagickWand/magick-image.h
+++ b/MagickWand/magick-image.h
@@ -342,7 +342,7 @@ extern WandExport MagickWand
   *MagickOptimizeImageLayers(MagickWand *),
   *MagickPreviewImages(MagickWand *wand,const PreviewType),
   *MagickSimilarityImage(MagickWand *,const MagickWand *,const MetricType,
-    RectangleInfo *,double *),
+    const double,RectangleInfo *,double *),
   *MagickSmushImages(MagickWand *,const MagickBooleanType,const ssize_t),
   *MagickSteganoImage(MagickWand *,const MagickWand *,const ssize_t),
   *MagickStereoImage(MagickWand *,const MagickWand *),