(no commit message)

diff --git a/config/configure.xml b/config/configure.xml
index ad464e9d92a0c1e284da2ae4a96ca4c33e4bd0d3..5602b95aa79c4077b698014d2afc5623590c8406 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="6.7.0"/>
   <configure name="LIB_VERSION" value="0x670"/>
   <configure name="LIB_VERSION_NUMBER" value="6,7,0,7"/>
-  <configure name="SVN_REVISION" value="4529" />
-  <configure name="RELEASE_DATE" value="2011-06-08"/>
+  <configure name="SVN_REVISION" value="4615" />
+  <configure name="RELEASE_DATE" value="2011-06-12"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 608ef9149535834fbddc9663e9fb01fd84e2af34..297857b0868afbaefbc9588822d7a03a23be19bb 100755 (executable)
--- a/configure
+++ b/configure
@@ -3582,7 +3582,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=4529
+MAGICK_SVN_REVISION=4615
 
 
 

diff --git a/magick/attribute.c b/magick/attribute.c
index 8378d460c365704551cb3826c065595c8ea2198d..c4fee6ac41fb09a0f58428e279f8c1d9f9404730 100644 (file)
--- a/magick/attribute.c
+++ b/magick/attribute.c
@@ -924,13 +924,13 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image,
       for (i=0; i < (ssize_t) image->colors; i++)
       {
         if ((channel & RedChannel) != 0)
-          GetRedPixelComponent(p)=ScaleAnyToQuantum(ScaleQuantumToAny(GetRedPixelComponent(p),range),range);
+          p->red=ScaleAnyToQuantum(ScaleQuantumToAny(p->red,range),range);
         if ((channel & GreenChannel) != 0)
-          GetGreenPixelComponent(p)=ScaleAnyToQuantum(ScaleQuantumToAny(GetGreenPixelComponent(p),range),range);
+          p->green=ScaleAnyToQuantum(ScaleQuantumToAny(p->green,range),range);
         if ((channel & BlueChannel) != 0)
-          GetBluePixelComponent(p)=ScaleAnyToQuantum(ScaleQuantumToAny(GetBluePixelComponent(p),range),range);
+          p->blue=ScaleAnyToQuantum(ScaleQuantumToAny(p->blue,range),range);
         if ((channel & OpacityChannel) != 0)
-          GetOpacityPixelComponent(p)=ScaleAnyToQuantum(ScaleQuantumToAny(GetOpacityPixelComponent(p),range),
+          p->opacity=ScaleAnyToQuantum(ScaleQuantumToAny(p->opacity,range),
             range);
         p++;
       }

diff --git a/magick/colormap.c b/magick/colormap.c
index 5f3aab3058feb652152304c2e8d9ac1a82a548f3..26adf3b18484c79684da12e6a869e954eed78fc3 100644 (file)
--- a/magick/colormap.c
+++ b/magick/colormap.c
@@ -379,6 +379,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image)
       index=(IndexPacket) pixels[(ssize_t) GetIndexPixelComponent(indexes+x)];
       SetIndexPixelComponent(indexes+x,index);
       SetRGBOPixelComponents(q,image->colormap+(ssize_t) index);
+      q++;
     }
     if (SyncCacheViewAuthenticPixels(image_view,exception) == MagickFalse)
       status=MagickFalse;

diff --git a/magick/compare.c b/magick/compare.c
index c47dcd9887383746f7b513414722bfda2cd6c953..586d93084733b5e56f8fcbfba643f18bf8e7f6a5 100644 (file)
--- a/magick/compare.c
+++ b/magick/compare.c
@@ -1793,8 +1793,8 @@ static double GetNCCDistortion(const Image *image,
       if ((image->colorspace == CMYKColorspace) &&
           (reconstruct_image->colorspace == CMYKColorspace))
         distortion+=area*QuantumScale*(GetIndexPixelComponent(indexes+x)-
-          image_statistics[OpacityChannel].mean)*(GetIndexPixelComponent(
-          reconstruct_indexes+x)-reconstruct_statistics[OpacityChannel].mean);
+          image_statistics[BlackChannel].mean)*(GetIndexPixelComponent(
+          reconstruct_indexes+x)-reconstruct_statistics[BlackChannel].mean);
       p++;
       q++;
     }

diff --git a/magick/quantize.c b/magick/quantize.c
index d7cf7484e3c1a12d89a1c7fd16cb0234ede931ca..9c976e70aaaaaf4d165239ed31c7a2e4b9c25386 100644 (file)
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -1598,7 +1598,7 @@ static MagickBooleanType FloydSteinbergDither(Image *image,CubeInfo *cube_info)
         SetIndexPixelComponent(indexes+u,index);
       if (cube.quantize_info->measure_error == MagickFalse)
         {
-          SetRGBPixelComponents(q,image->colormap+index);
+          SetRGBPixelComponents(q+u,image->colormap+index);
           if (cube.associate_alpha != MagickFalse)
             SetOpacityPixelComponent(q+u,image->colormap[index].opacity);
         }

diff --git a/magick/version.h b/magick/version.h
index 19a694acef34f86e2c4564893a498f005e956c5a..fa88384e122763daae8bdb2ef7ddfc8917820e46 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -27,15 +27,15 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "4529"
+#define MagickSVNRevision  "4615"
 #define MagickLibVersion  0x670
 #define MagickLibVersionText  "6.7.0"
 #define MagickLibVersionNumber  4,0,1
 #define MagickLibAddendum  "-7"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-06-08"
-#define MagickChangeDate   "20110608"
+#define MagickReleaseDate  "2011-06-12"
+#define MagickChangeDate   "20110609"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "