(no commit message)

diff --git a/MagickCore/fx.c b/MagickCore/fx.c
index 8796a8d11cfed1915721f2e275d9865d8dec1e4d..b3fa9cb74b3f48d1ba1ca2d8e3ab080e43fc027c 100644 (file)
--- a/MagickCore/fx.c
+++ b/MagickCore/fx.c
@@ -658,8 +658,8 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
   const PixelInfo *colorize,ExceptionInfo *exception)
 {
 #define ColorizeImageTag  "Colorize/Image"
-#define Colorize(pixel,blend_percentage,colorize)  (pixel)= \
-  ((pixel)*(100.0-(blend_percentage))+(colorize)*(blend_percentage))/100.0
+#define Colorize(pixel,blend_percentage,colorize)  \
+  (((pixel)*(100.0-(blend_percentage))+(colorize)*(blend_percentage))/100.0)
 
   CacheView
     *colorize_view,
@@ -748,9 +748,6 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
     MagickBooleanType
       sync;
 
-    PixelInfo
-      pixel;
-
     register const Quantum
       *restrict p;
 
@@ -770,22 +767,36 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend,
         status=MagickFalse;
         continue;
       }
-    GetPixelInfo(colorize_image,&pixel);
     for (x=0; x < (ssize_t) image->columns; x++)
     {
-      if (GetPixelMask(colorize_image,q) != 0)
-        {
-          p+=GetPixelChannels(image);
-          q+=GetPixelChannels(colorize_image);
+      register ssize_t
+        i;
+
+      for (i=0; i < (ssize_t) GetPixelChannels(image); i++)
+      {
+        PixelChannel
+          channel;
+
+        PixelTrait
+          colorize_traits,
+          traits;
+
+        channel=GetPixelChannelMapChannel(image,i);
+        traits=GetPixelChannelMapTraits(image,channel);
+        colorize_traits=GetPixelChannelMapTraits(colorize_image,channel);
+        if ((traits == UndefinedPixelTrait) ||
+            (colorize_traits == UndefinedPixelTrait))
           continue;
-        }
-      GetPixelInfoPixel(image,p,&pixel);
-      Colorize(pixel.red,blend_percentage.red,colorize->red);
-      Colorize(pixel.green,blend_percentage.green,colorize->green);
-      Colorize(pixel.blue,blend_percentage.blue,colorize->blue);
-      Colorize(pixel.black,blend_percentage.black,colorize->black);
-      Colorize(pixel.alpha,blend_percentage.alpha,colorize->alpha);
-      SetPixelInfoPixel(colorize_image,&pixel,q);
+        if (((colorize_traits & CopyPixelTrait) != 0) ||
+            (GetPixelMask(image,p) != 0))
+          {
+            SetPixelChannel(colorize_image,channel,p[i],q);
+            continue;
+          }
+        channel=GetPixelChannelMapChannel(colorize_image,channel);
+        q[i]=ClampToQuantum(Colorize(p[i],GetPixelInfoChannel(&blend_percentage,
+          channel),GetPixelInfoChannel(colorize,channel)));
+      }
       p+=GetPixelChannels(image);
       q+=GetPixelChannels(colorize_image);
     }

diff --git a/MagickCore/version.h b/MagickCore/version.h
index dc79fa962aa6b21b8c5602605ebea8285cabf257..59fbbd8cd1c19fc8115a6161f955da295e982c59 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9013:9040M"
+#define MagickSVNRevision  "9067:9100M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-08-21"
+#define MagickReleaseDate  "2012-08-24"
 #define MagickChangeDate   "20120808"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.am b/Makefile.am
index a6295e78d9873aa55113212e55ba5e8c07f69015..857f28fd8d458ff357b0a33a65dc35e84b7bc79b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,24 +76,9 @@ TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 
 # Environment parameters to be used during tests
 TESTS_ENVIRONMENT = \
-       COMPARE="$(MEMCHECK) @abs_top_builddir@/utilities/compare" \
-       COMPOSITE="$(MEMCHECK) @abs_top_builddir@/utilities/composite" \
-       CONJURE="$(MEMCHECK) @abs_top_builddir@/utilities/conjure" \
-       CONVERT="$(MEMCHECK) @abs_top_builddir@/utilities/convert" \
-       DISPLAY="$(MEMCHECK) @abs_top_builddir@/utilities/display" \
-       IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
-       MAGICK="$(MEMCHECK) @abs_top_builddir@/utilities/magick" \
-       MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
-       VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
-       LD_LIBRARY_PATH="@abs_top_builddir@/MagickCore/.libs:${LD_LIBRARY_PATH}" \
-       MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
-       MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \
-       MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@' \
        MAKE="$(MAKE)" \
        MAKEFLAGS="$(MAKEFLAGS)" \
-       MEMCHECK="$(MEMCHECK)" \
-       PATH="@abs_top_builddir@/utilities:${PATH}" \
-       SRCDIR=$(SRCDIR)
+       MEMCHECK="$(MEMCHECK)"
 
 # Tests to run
 TESTS = \

diff --git a/Makefile.in b/Makefile.in
index 399e8a8513e3d29f3e1f8339f378a476902a3ff0..f7ce3786cba189f556d23805daf0afddfdaea4ab 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -276,6 +276,7 @@ DIST_COMMON = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \
        $(top_srcdir)/config/type-ghostscript.xml.in \
        $(top_srcdir)/config/type-windows.xml.in \
        $(top_srcdir)/config/type.xml.in $(top_srcdir)/configure \
+       $(top_srcdir)/tests/common.shi.in \
        $(top_srcdir)/utilities/ImageMagick.1.in \
        $(top_srcdir)/utilities/animate.1.in \
        $(top_srcdir)/utilities/compare.1.in \
@@ -334,9 +335,9 @@ CONFIG_CLEAN_FILES = config/configure.xml config/delegates.xml \
        Magick++/lib/Magick++.pc MagickCore/MagickCore-config \
        MagickCore/MagickCore.pc MagickCore/version.h magick.sh \
        PerlMagick/Magick.pm PerlMagick/Makefile.PL \
-       PerlMagick/check.sh utilities/animate.1 utilities/compare.1 \
-       utilities/composite.1 utilities/conjure.1 utilities/convert.1 \
-       utilities/display.1 utilities/identify.1 \
+       PerlMagick/check.sh tests/common.shi utilities/animate.1 \
+       utilities/compare.1 utilities/composite.1 utilities/conjure.1 \
+       utilities/convert.1 utilities/display.1 utilities/identify.1 \
        utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 \
        utilities/montage.1 utilities/stream.1 \
        MagickWand/MagickWand-config MagickWand/MagickWand.pc
@@ -2909,24 +2910,9 @@ TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
 
 # Environment parameters to be used during tests
 TESTS_ENVIRONMENT = \
-       COMPARE="$(MEMCHECK) @abs_top_builddir@/utilities/compare" \
-       COMPOSITE="$(MEMCHECK) @abs_top_builddir@/utilities/composite" \
-       CONJURE="$(MEMCHECK) @abs_top_builddir@/utilities/conjure" \
-       CONVERT="$(MEMCHECK) @abs_top_builddir@/utilities/convert" \
-       DISPLAY="$(MEMCHECK) @abs_top_builddir@/utilities/display" \
-       IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
-       MAGICK="$(MEMCHECK) @abs_top_builddir@/utilities/magick" \
-       MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
-       VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
-       LD_LIBRARY_PATH="@abs_top_builddir@/MagickCore/.libs:${LD_LIBRARY_PATH}" \
-       MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@' \
-       MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@' \
-       MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@' \
        MAKE="$(MAKE)" \
        MAKEFLAGS="$(MAKEFLAGS)" \
-       MEMCHECK="$(MEMCHECK)" \
-       PATH="@abs_top_builddir@/utilities:${PATH}" \
-       SRCDIR=$(SRCDIR)
+       MEMCHECK="$(MEMCHECK)"
 
 TOP_EXTRA_DIST = \
   AUTHORS.txt \
@@ -5151,6 +5137,8 @@ PerlMagick/Makefile.PL: $(top_builddir)/config.status $(top_srcdir)/PerlMagick/M
        cd $(top_builddir) && $(SHELL) ./config.status $@
 PerlMagick/check.sh: $(top_builddir)/config.status $(top_srcdir)/PerlMagick/check.sh.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
+tests/common.shi: $(top_builddir)/config.status $(top_srcdir)/tests/common.shi.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 utilities/animate.1: $(top_builddir)/config.status $(top_srcdir)/utilities/animate.1.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 utilities/compare.1: $(top_builddir)/config.status $(top_srcdir)/utilities/compare.1.in

diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index 9ce170e25252637a9abe92848a121ce0a3bedad9..ad08f3d85d3acd75696a5101d501f04af0576cf9 100644 (file)
--- a/config/ImageMagick.rdf
+++ b/config/ImageMagick.rdf
@@ -5,7 +5,7 @@
     <name>ImageMagick</name>
     <shortdesc xml:lang="en">ImageMagick: convert, edit, and compose images.</shortdesc>
     <homepage rdf:resource="http://www.imagemagick.org/"/>
-    <created>2012-08-21</created>
+    <created>2012-08-24</created>
 
     <description xml:lang="en">
 ImageMagick® is a software suite to create, edit, compose, or convert bitmap images. It can read and write images in a variety of formats (over 100) including DPX, EXR, GIF, JPEG, JPEG-2000, PDF, PhotoCD, PNG, Postscript, SVG, and TIFF. Use ImageMagick to resize, flip, mirror, rotate, distort, shear and transform images, adjust image colors, apply various special effects, or draw text, lines, polygons, ellipses and Bézier curves.
@@ -57,7 +57,7 @@ Examples of ImageMagick Usage shows how to use ImageMagick from the command-line
     <release>
       <Version>
           <name>stable</name>
-          <created>2012-08-21</created>
+          <created>2012-08-24</created>
           <revision>7.0.0</revision>
           <patch-level>-0</patch-level>
       </Version>

diff --git a/config/configure.xml b/config/configure.xml
index af207378b315cb9bb19486e1896fdd70d83007d7..17e9c07cf51fb7946c82f35b88ed1e79df114669 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="9013:9040M" />
-  <configure name="RELEASE_DATE" value="2012-08-21"/>
+  <configure name="SVN_REVISION" value="9067:9100M" />
+  <configure name="RELEASE_DATE" value="2012-08-24"/>
   <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 354c67b1eeeda43855d1305082503cb601d65391..874b3a25e420a9ee997af444d21a677c86ed490d 100755 (executable)
--- a/configure
+++ b/configure
@@ -3499,7 +3499,7 @@ ac_config_headers="$ac_config_headers config/config.h"
 
 ac_config_commands="$ac_config_commands MagickCore/magick-config.h"
 
-ac_config_files="$ac_config_files config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config MagickCore/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc MagickCore/MagickCore-config MagickCore/MagickCore.pc MagickCore/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 MagickWand/MagickWand-config MagickWand/MagickWand.pc"
+ac_config_files="$ac_config_files config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config MagickCore/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc MagickCore/MagickCore-config MagickCore/MagickCore.pc MagickCore/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh tests/common.shi utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 MagickWand/MagickWand-config MagickWand/MagickWand.pc"
 
 
 #
@@ -3666,7 +3666,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=9013:9040M
+MAGICK_SVN_REVISION=9067:9100M
 
 
 
@@ -37157,6 +37157,7 @@ do
     "PerlMagick/Magick.pm") CONFIG_FILES="$CONFIG_FILES PerlMagick/Magick.pm" ;;
     "PerlMagick/Makefile.PL") CONFIG_FILES="$CONFIG_FILES PerlMagick/Makefile.PL" ;;
     "PerlMagick/check.sh") CONFIG_FILES="$CONFIG_FILES PerlMagick/check.sh" ;;
+    "tests/common.shi") CONFIG_FILES="$CONFIG_FILES tests/common.shi" ;;
     "utilities/animate.1") CONFIG_FILES="$CONFIG_FILES utilities/animate.1" ;;
     "utilities/compare.1") CONFIG_FILES="$CONFIG_FILES utilities/compare.1" ;;
     "utilities/composite.1") CONFIG_FILES="$CONFIG_FILES utilities/composite.1" ;;

diff --git a/configure.ac b/configure.ac
index 15c872870f531e37521c6742677c4cbae1d5aeea..35f1b304a25148d24d8ec9ef843f22c856774706 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,7 @@ AC_CONFIG_FILES([\
     PerlMagick/Magick.pm \
     PerlMagick/Makefile.PL \
     PerlMagick/check.sh \
+    tests/common.shi \
     utilities/animate.1 \
     utilities/compare.1 \
     utilities/composite.1 \

diff --git a/tests/common.shi b/tests/common.shi
index b5e6b7dd021d1c7cefc6402ed702dca444964e29..04299aa2f81b111fb19633c64f15780b6bafa8a7 100644 (file)
--- a/tests/common.shi
+++ b/tests/common.shi
@@ -1,9 +1,20 @@
-SRCDIR=`dirname $0`
-SRCDIR=`cd $SRCDIR && pwd`
-TOPSRCDIR=`cd $srcdir && pwd`
-REFERENCE_IMAGE="${TOPSRCDIR}/images/rose.pnm"
-[ "X$CONVERT" = "X" ] && CONVERT=convert
-[ "X$MAGICK" = "X" ] && MAGICK=magick
-[ "X$IDENTIFY" = "X" ] && IDENTIFY=identify
-export SRCDIR TOPSRCDIR
-cd tests || exit 1
+# Test environment
+top_srcdir='/home/cristy/ImageMagick/ImageMagick'
+top_builddir='/home/cristy/ImageMagick/ImageMagick'
+
+set -a
+COMPARE="$(MEMCHECK) /home/cristy/ImageMagick/ImageMagick/utilities/compare"
+COMPOSITE="$(MEMCHECK) /home/cristy/ImageMagick/ImageMagick/utilities/composite"
+CONJURE="$(MEMCHECK) /home/cristy/ImageMagick/ImageMagick/utilities/conjure"
+CONVERT="$(MEMCHECK) /home/cristy/ImageMagick/ImageMagick/utilities/convert"
+DISPLAY="$(MEMCHECK) /home/cristy/ImageMagick/ImageMagick/utilities/display"
+IDENTIFY="$(MEMCHECK) /home/cristy/ImageMagick/ImageMagick/utilities/identify"
+MONTAGE="$(MEMCHECK) /home/cristy/ImageMagick/ImageMagick/utilities/montage"
+VALIDATE="$(MEMCHECK) /home/cristy/ImageMagick/ImageMagick/tests/validate"
+LD_LIBRARY_PATH="/home/cristy/ImageMagick/ImageMagick/magick/.libs:${LD_LIBRARY_PATH}"
+MAGICK_CODER_MODULE_PATH='/home/cristy/ImageMagick/ImageMagick/coders'
+MAGICK_CONFIGURE_PATH='/home/cristy/ImageMagick/ImageMagick/config:/home/cristy/ImageMagick/ImageMagick/config'
+MAGICK_FILTER_MODULE_PATH='/home/cristy/ImageMagick/ImageMagick/filters'
+PATH="/home/cristy/ImageMagick/ImageMagick/utilities:${PATH}"
+SRCDIR=$(SRCDIR)
+set +a

diff --git a/tests/common.shi.in b/tests/common.shi.in
new file mode 100644 (file)
index 0000000..91bb7c3
--- /dev/null
+++ b/tests/common.shi.in
@@ -0,0 +1,20 @@
+# Test environment
+top_srcdir='@abs_top_srcdir@'
+top_builddir='@abs_top_builddir@'
+
+set -a
+COMPARE="$(MEMCHECK) @abs_top_builddir@/utilities/compare"
+COMPOSITE="$(MEMCHECK) @abs_top_builddir@/utilities/composite"
+CONJURE="$(MEMCHECK) @abs_top_builddir@/utilities/conjure"
+CONVERT="$(MEMCHECK) @abs_top_builddir@/utilities/convert"
+DISPLAY="$(MEMCHECK) @abs_top_builddir@/utilities/display"
+IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify"
+MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage"
+VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate"
+LD_LIBRARY_PATH="@abs_top_builddir@/magick/.libs:${LD_LIBRARY_PATH}"
+MAGICK_CODER_MODULE_PATH='@MAGICK_CODER_MODULE_PATH@'
+MAGICK_CONFIGURE_PATH='@MAGICK_CONFIGURE_BUILD_PATH@@DIRSEP@@MAGICK_CONFIGURE_SRC_PATH@'
+MAGICK_FILTER_MODULE_PATH='@MAGICK_FILTER_MODULE_PATH@'
+PATH="@abs_top_builddir@/utilities:${PATH}"
+SRCDIR=$(SRCDIR)
+set +a