(no commit message)

diff --git a/ImageMagick.spec b/ImageMagick.spec
index 27e3ba8b61fcb9e168de815e23f5d8d8a0e88855..742f241500e0b302392d2a4cd8a9cec62f37c792 100644 (file)
--- a/ImageMagick.spec
+++ b/ImageMagick.spec
@@ -1,5 +1,5 @@
 %define VERSION  6.6.0
-%define Patchlevel  5
+%define Patchlevel  4
 
 Name:           ImageMagick
 Version:        %{VERSION}

diff --git a/config/configure.xml b/config/configure.xml
index 127b47a8f535548f01ace30673d1c722458cc573..25fbaadb1cb100770da9dee0457d4d2188bfc791 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,7 +8,7 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x660"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,0,5"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,0,4"/>
   <configure name="RELEASE_DATE" value="2010-03-08"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index d3ee42c90c8a82a70aa6524e22c335e03cfb81c7..eaf8b4fda0d406074026eecb1d33c3fa74426d3f 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -1,7 +1,7 @@
 #! /bin/sh
 
 # libtool - Provide generalized library-building support services.
-# Generated automatically by config.status (ImageMagick) 6.6.0-5
+# Generated automatically by config.status (ImageMagick) 6.6.0-4
 # Libtool was configured on host magick.imagemagick.org:
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #

diff --git a/magick/statistic.c b/magick/statistic.c
index c11ef5bea52fe8168b85632ba4520e05e7c0774f..72c493f52835c356ef9d9e69afa2f619a406eb53 100644 (file)
--- a/magick/statistic.c
+++ b/magick/statistic.c
@@ -513,16 +513,18 @@ MagickExport Image *EvaluateImages(const Image *images,
       for (x=0; x < (long) next->columns; x++)
       {
         evaluate_pixel[x].red=ApplyEvaluateOperator(random_info[id],p->red,
-          op,evaluate_pixel[x].red);
+          i == 0 ? AddEvaluateOperator : op,evaluate_pixel[x].red);
         evaluate_pixel[x].green=ApplyEvaluateOperator(random_info[id],p->green,
-          op,evaluate_pixel[x].green);
+          i == 0 ? AddEvaluateOperator : op,evaluate_pixel[x].green);
         evaluate_pixel[x].blue=ApplyEvaluateOperator(random_info[id],p->blue,
-          op,evaluate_pixel[x].blue);
+          i == 0 ? AddEvaluateOperator : op,evaluate_pixel[x].blue);
         evaluate_pixel[x].opacity=ApplyEvaluateOperator(random_info[id],
-          p->opacity,op,evaluate_pixel[x].opacity);
+          p->opacity,i == 0 ? AddEvaluateOperator : op,
+          evaluate_pixel[x].opacity);
         if (evaluate_image->colorspace == CMYKColorspace)
           evaluate_pixel[x].index=ApplyEvaluateOperator(random_info[id],
-            indexes[x],op,evaluate_pixel[x].index);
+            indexes[x],i == 0 ? AddEvaluateOperator : op,
+            evaluate_pixel[x].index);
         p++;
       }
       image_view=DestroyCacheView(image_view);

diff --git a/magick/version.h b/magick/version.h
index 1161c67aeafc0b35232ffc294ad6fdd3e32b4043..e075470f51b4978af0cc063c6598d79a2e216000 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,7 +30,7 @@ extern "C" {
 #define MagickLibVersion  0x660
 #define MagickLibVersionText  "6.6.0"
 #define MagickLibVersionNumber  3,0,0
-#define MagickLibAddendum  "-5"
+#define MagickLibAddendum  "-4"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
 #define MagickReleaseDate  "2010-03-08"

diff --git a/version.sh b/version.sh
index 18c8878f5da47bdf8ff3ac18ba807348ae17fbdb..c721628cf73b4e2c64a939d3ea56612258445670 100644 (file)
--- a/version.sh
+++ b/version.sh
@@ -12,7 +12,7 @@ PACKAGE_NAME='ImageMagick'
 # PACKAGE_NAME (e.g. "1.0.0").
 PACKAGE_VERSION='6.6.0'
 PACKAGE_LIB_VERSION="0x660"
-PACKAGE_RELEASE="5"
+PACKAGE_RELEASE="4"
 PACKAGE_LIB_VERSION_NUMBER="6,6,0,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"