(no commit message)

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

diff --git a/Makefile.am b/Makefile.am
index 3e350f4c740a754f85dae069afbe5a51cd016c44..e2e986f4d656ab1dffba43a6837fe2fa72610e83 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -76,7 +76,6 @@ TESTS_ENVIRONMENT = \
   IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
   MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
   VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
-  REFERENCE_IMAGE="@abs_top_builddir@/images/rose.pnm" \
        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@' \

diff --git a/Makefile.in b/Makefile.in
index 14e618b4fa5f104a1b5eb23d55b3d8f6c26e26d3..64f7bb87aa891215a54213e107de28907cf8d164 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2586,7 +2586,6 @@ TESTS_ENVIRONMENT = \
   IDENTIFY="$(MEMCHECK) @abs_top_builddir@/utilities/identify" \
   MONTAGE="$(MEMCHECK) @abs_top_builddir@/utilities/montage" \
   VALIDATE="$(MEMCHECK) @abs_top_builddir@/tests/validate" \
-  REFERENCE_IMAGE="@abs_top_builddir@/images/rose.pnm" \
        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@' \
@@ -4531,13 +4530,13 @@ TESTS_TESTS = \
        tests/validate-compare.sh \
        tests/validate-composite.sh \
        tests/validate-convert.sh \
-       tests/validate-formats-on-disk.sh \
-       tests/validate-formats-in-memory.sh \
        tests/validate-identify.sh \
        tests/validate-import.sh \
        tests/validate-montage.sh \
        tests/validate-pipe.sh \
-       tests/validate-stream.sh
+       tests/validate-stream.sh \
+       tests/validate-formats-in-memory.sh \
+       tests/validate-formats-on-disk.sh
 
 TESTS_EXTRA_DIST = \
        tests/common.sh \

diff --git a/config/configure.xml b/config/configure.xml
index 05792158ba4c023e048359edc72071ec3ca29450..0a31b6413d8a114cb7bf20cccf0a25fe388a2648 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -8,8 +8,8 @@
 <configuremap>
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x660"/>
-  <configure name="LIB_VERSION_NUMBER" value="6,6,0,3"/>
-  <configure name="RELEASE_DATE" value="2010-03-05"/>
+  <configure name="LIB_VERSION_NUMBER" value="6,6,0,4"/>
+  <configure name="RELEASE_DATE" value="2010-03-06"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/libtool b/libtool
index d9595fb6ce5deb984301f404581f1f90016f6c75..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-3
+# 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/version.h b/magick/version.h
index 3d5ac8c77f480fb880606a146bd22b8fcf6cf9a8..190393ecacf9d0ba97be312f2a0ef084db5b127c 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -30,10 +30,10 @@ extern "C" {
 #define MagickLibVersion  0x660
 #define MagickLibVersionText  "6.6.0"
 #define MagickLibVersionNumber  3,0,0
-#define MagickLibAddendum  "-3"
+#define MagickLibAddendum  "-4"
 #define MagickLibInterface  3
 #define MagickLibMinInterface  3
-#define MagickReleaseDate  "2010-03-05"
+#define MagickReleaseDate  "2010-03-06"
 #define MagickChangeDate   "20100305"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.6.0/index.html"

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 202f7c51de234e5634d811887045f4fdc3145d14..217e503550b70445cd15758933dce47f43b93f19 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -27,13 +27,13 @@ TESTS_TESTS = \
        tests/validate-compare.sh \
        tests/validate-composite.sh \
        tests/validate-convert.sh \
-       tests/validate-formats-on-disk.sh \
-       tests/validate-formats-in-memory.sh \
        tests/validate-identify.sh \
        tests/validate-import.sh \
        tests/validate-montage.sh \
        tests/validate-pipe.sh \
-       tests/validate-stream.sh
+       tests/validate-stream.sh \
+       tests/validate-formats-in-memory.sh \
+       tests/validate-formats-on-disk.sh
 
 TESTS_EXTRA_DIST = \
        tests/common.sh \

diff --git a/tests/common.sh b/tests/common.sh
index 30b7f5333db9fd33d5edae28ae276ac12b9aadce..6e6c0f5e94f1647b898a7c0a3208dda6be8556ad 100644 (file)
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -1,5 +1,6 @@
 SRCDIR=`dirname $0`
 SRCDIR=`cd $SRCDIR && pwd`
 TOPSRCDIR=`cd $srcdir && pwd`
+REFERENCE_IMAGE="${TOPSRCDIR}/images/rose.pnm"
 export SRCDIR TOPSRCDIR
 cd tests || exit 1

diff --git a/utilities/convert.1 b/utilities/convert.1
index 891f0c76b4b524acf2865041394c7bb066e4b930..28dc9a7b6c65f3e77cae6ac30ec62ba7ceb743eb 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -231,8 +231,8 @@ Image Sequence Operators:
   \-flatten             flatten a sequence of images
   \-fx expression       apply mathematical expression to an image channel(s)
   \-hald-clut           apply a Hald color lookup table to the image
-  \-intensity-projection
-                       the maximum (or minimum) intensity projection
+  \-maximum             the maximum intensity of an image sequence
+  \-minimum             the minimum intensity of an image sequence
   \-morph value         morph an image sequence
   \-mosaic              create a mosaic from an image sequence
   \-process arguments   process the image with a custom image filter

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 4aa4d7a09a606e5a9129fd7c89926efe5e873571..97947662a1a867fe35b670a58516da6c09740bc6 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -233,8 +233,8 @@ Image Sequence Operators:
   \-flatten             flatten a sequence of images
   \-fx expression       apply mathematical expression to an image channel(s)
   \-hald-clut           apply a Hald color lookup table to the image
-  \-intensity-projection
-                       the maximum (or minimum) intensity projection
+  \-maximum             the maximum intensity of an image sequence
+  \-minimum             the minimum intensity of an image sequence
   \-morph value         morph an image sequence
   \-mosaic              create a mosaic from an image sequence
   \-process arguments   process the image with a custom image filter

diff --git a/version.sh b/version.sh
index b26dbcc63c90f14762b238d811c75e21fbd21a3c..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="3"
+PACKAGE_RELEASE="4"
 PACKAGE_LIB_VERSION_NUMBER="6,6,0,${PACKAGE_RELEASE}"
 PACKAGE_RELEASE_DATE=`date +%F`
 PACKAGE_STRING="$PACKAGE_NAME $PACKAGE_VERSION"