From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 7 Dec 2010 14:12:32 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8416
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a3240b423a364b396844d8eb99fa8794c53092e1;p=imagemagick

---

diff --git a/config/configure.xml b/config/configure.xml
index ae536263e..9bfb91505 100644
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x666"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,6,4"/>
-  <configure name="RELEASE_DATE" value="2010-12-04"/>
+  <configure name="RELEASE_DATE" value="2010-12-07"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
diff --git a/magick/color.c b/magick/color.c
index d28798949..b21d3d1dc 100644
--- a/magick/color.c
+++ b/magick/color.c
@@ -1568,6 +1568,19 @@ MagickExport MagickBooleanType IsColorSimilar(const Image *image,
       alpha=(MagickRealType) (QuantumScale*(GetAlphaPixelComponent(p)));
       beta=(MagickRealType) (QuantumScale*GetAlphaPixelComponent(q));
     }
+  if ((image->colorspace == HSLColorspace) ||
+      (image->colorspace == HSBColorspace) ||
+      (image->colorspace == HWBColorspace))
+    {
+      if (fabs((double) (p->red-q->red)) > (QuantumRange/2))
+        {
+          if (p->red > (QuantumRange/2))
+            pixel=alpha*(p->red-QuantumRange)-beta*q->red;
+          else
+            pixel=alpha*p->red-beta*(q->red-QuantumRange);
+        }
+        pixel*=2;
+     }
   pixel=alpha*p->red-beta*q->red;
   distance=pixel*pixel;
   if (distance > fuzz)
@@ -1578,6 +1591,12 @@ MagickExport MagickBooleanType IsColorSimilar(const Image *image,
     return(MagickFalse);
   pixel=alpha*p->blue-beta*q->blue;
   distance+=pixel*pixel;
+  if (distance > fuzz)
+    return(MagickFalse);
+  pixel=(MagickRealType) OpaqueOpacity;
+  if (image->matte != MagickFalse)
+    pixel=(MagickRealType) p->opacity-q->opacity;
+  distance+=pixel*pixel;
   if (distance > fuzz)
     return(MagickFalse);
   return(MagickTrue);
@@ -1772,7 +1791,7 @@ MagickExport MagickBooleanType IsMagickColorSimilar(const MagickPixelPacket *p,
   if ((p->colorspace == HSLColorspace) || (p->colorspace == HSBColorspace) ||
       (p->colorspace == HWBColorspace))
     {
-      if (fabs(p->red-q->red) > (QuantumRange/2))
+      if (fabs((double) (p->red-q->red)) > (QuantumRange/2))
         {
           if (p->red > (QuantumRange/2))
             pixel=alpha*(p->red-QuantumRange)-beta*q->red;
diff --git a/magick/version.h b/magick/version.h
index 8c78184eb..b80744a63 100644
--- a/magick/version.h
+++ b/magick/version.h
@@ -29,12 +29,12 @@ extern "C" {
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
 #define MagickLibVersion  0x666
 #define MagickLibVersionText  "6.6.6"
-#define MagickLibVersionNumber  4,0,0
+#define MagickLibVersionNumber  4,0,1
 #define MagickLibAddendum  "-4"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2010-12-04"
-#define MagickChangeDate   "20101203"
+#define MagickReleaseDate  "2010-12-07"
+#define MagickChangeDate   "20101206"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "