(no commit message)

diff --git a/Magick++/tests/appendImages.cpp b/Magick++/tests/appendImages.cpp
index 8ad480c8afe7f898e040c13b6dcd28f83ce838a7..a5520cb14cfdea467f4bfed728dde9bdfc329d0d 100644 (file)
--- a/Magick++/tests/appendImages.cpp
+++ b/Magick++/tests/appendImages.cpp
@@ -42,7 +42,7 @@ int main( int /*argc*/, char ** argv)
     appendImages( &appended, imageList.begin(), imageList.end() );
     // appended.display();
     if (( appended.signature() != "3a90bb0bb8f69f6788ab99e9e25598a0d6c5cdbbb797f77ad68011e0a8b1689d" ) &&
-        ( appended.signature() != "c15fcd1e739b73638dc4e36837bdb53f7087359544664caf7b1763928129f3c7" ) &&
+        ( appended.signature() != "08da95f96ad8a98885d30b8d3198206baee5dc43030a15960953ffd8719f51bc" ) &&
         ( appended.signature() != "229ff72f812e5f536245dc3b4502a0bc2ab2363f67c545863a85ab91ebfbfb83" ) &&
         ( appended.signature() != "b98c42c55fc4e661cb3684154256809c03c0c6b53da2738b6ce8066e1b6ddef0" ))
       {
@@ -57,7 +57,7 @@ int main( int /*argc*/, char ** argv)
     // Vertical
     appendImages( &appended, imageList.begin(), imageList.end(), true );
     if (( appended.signature() != "d73d25ccd6011936d08b6d0d89183b7a61790544c2195269aff4db2f782ffc08" ) &&
-        ( appended.signature() != "0909f7ffa7c6ea410fb2ebfdbcb19d61b19c4bd271851ce3bd51662519dc2b58" ) &&
+        ( appended.signature() != "aa99c258c20eccd697eb95f4a0e223b3bddd1706ab3dd3f831a1664a4b23461f" ) &&
         ( appended.signature() != "11b97ba6ac1664aa1c2faed4c86195472ae9cce2ed75402d975bb4ffcf1de751" ) &&
         ( appended.signature() != "cae4815eeb3cb689e73b94d897a9957d3414d1d4f513e8b5e52579b05d164bfe" ))
       {

diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
index 6368ad5e27ec8ed15af590bfba9ab7136fc4331c..b2363274f96664f4b1572da800f505076d5e626a 100644 (file)
--- a/Magick++/tests/attributes.cpp
+++ b/Magick++/tests/attributes.cpp
@@ -1283,15 +1283,8 @@ int main( int /*argc*/, char ** argv)
     //
 
     if ( image.signature() != "c7ac1ef7b47015c6ea6c1fb1d736eba4f8c3fe81dbfe511fbce104cedfce7588" &&
-        image.signature() != "d9464cd4d0c02f25166909726d6548db51d25fa91bd3cff642813f8a464bcfc7" &&
+        image.signature() != "f8f0a12460ba4c25ce6e6b7ea7325fefaf728f22fe6f0efd8be5a6ff832e5cf0" &&
         image.signature() != "e073572dfa4ad28f2f8dd3c6d37dfb14585e60c94cfae910149e97eff2fd895f" &&
-        image.signature() != "e12b9781b3a5025628567a4eabf970d16d42560e1b86189caceb03ec358dd8e6" &&
-        image.signature() != "6a989010d8ea958934ff8be44a42e0848f7c5e7e46cd53e04c4a90452c15d34c" &&
-        image.signature() != "7e5977b8bce5c40b858c84344803dae61feae0ef7a21739b2d068c9cdb72f95b" &&
-        image.signature() != "c8aed4b60d666e449f5c29d0fb32f089e3257422a1f11a4712451c5340362df0" &&
-        image.signature() != "bc272b75794971f4a3ade1bf524c0aee375765e9fb15d65278a8b9452b551ea6" &&
-        image.signature() != "482690062c78a9e78c9f5f3db514197a067028e9f1bec577b787fb9e9b044567" &&
-        image.signature() != "8610fd1c5ef905c05bf75438aaab8729d3e1277b8ec1e86927777bd3382702e5" &&
    image.signature() != "b891ddb1d32cd45c6329180e5bd733eebb8dd06c401a9c721841ec43e4a662f8")
       {
        ++failures;

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 4f420e39334e74dce8059c75061798a088fcee92..df4049a78129a7466581193a030eb7afa32416bc 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,9 +12,7 @@
 /* #undef AUTOTRACE_DELEGATE */
 
 /* Define if coders and filters are to be built as modules. */
-#ifndef MAGICKCORE_BUILD_MODULES
-#define MAGICKCORE_BUILD_MODULES 1
-#endif
+/* #undef BUILD_MODULES */
 
 /* Define if you have the bzip2 library */
 #ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -77,9 +75,7 @@
 #endif
 
 /* Define if you have FFTW library */
-#ifndef MAGICKCORE_FFTW_DELEGATE
-#define MAGICKCORE_FFTW_DELEGATE 1
-#endif
+/* #undef FFTW_DELEGATE */
 
 /* Location of filter modules */
 #ifndef MAGICKCORE_FILTER_PATH
@@ -221,9 +217,7 @@
 #endif
 
 /* Define to 1 if you have the <CL/cl.h> header file. */
-#ifndef MAGICKCORE_HAVE_CL_CL_H
-#define MAGICKCORE_HAVE_CL_CL_H 1
-#endif
+/* #undef HAVE_CL_CL_H */
 
 /* Define to 1 if you have the <complex.h> header file. */
 #ifndef MAGICKCORE_HAVE_COMPLEX_H
@@ -435,15 +429,15 @@
 #endif
 
 /* Define if you have the <lcms2.h> header file. */
-/* #undef HAVE_LCMS2_H */
+#ifndef MAGICKCORE_HAVE_LCMS2_H
+#define MAGICKCORE_HAVE_LCMS2_H 1
+#endif
 
 /* Define if you have the <lcms2/lcms2.h> header file. */
 /* #undef HAVE_LCMS2_LCMS2_H */
 
 /* Define if you have the <lcms.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS_H
-#define MAGICKCORE_HAVE_LCMS_H 1
-#endif
+/* #undef HAVE_LCMS_H */
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
@@ -1166,9 +1160,7 @@
 #endif
 
 /* Define if you have JBIG library */
-#ifndef MAGICKCORE_JBIG_DELEGATE
-#define MAGICKCORE_JBIG_DELEGATE 1
-#endif
+/* #undef JBIG_DELEGATE */
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
@@ -1197,9 +1189,7 @@
 #endif
 
 /* Define if you have LQR library */
-#ifndef MAGICKCORE_LQR_DELEGATE
-#define MAGICKCORE_LQR_DELEGATE 1
-#endif
+/* #undef LQR_DELEGATE */
 
 /* Define if using libltdl to support dynamically loadable modules */
 #ifndef MAGICKCORE_LTDL_DELEGATE
@@ -1211,7 +1201,7 @@
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/opt/intel/lib/intel64:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/nvidia:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */
@@ -1262,9 +1252,7 @@
 /* #undef NO_MINUS_C_MINUS_O */
 
 /* Define if you have OPENEXR library */
-#ifndef MAGICKCORE_OPENEXR_DELEGATE
-#define MAGICKCORE_OPENEXR_DELEGATE 1
-#endif
+/* #undef OPENEXR_DELEGATE */
 
 /* Define to the address where bug reports for this package should be sent. */
 #ifndef MAGICKCORE_PACKAGE_BUGREPORT
@@ -1319,9 +1307,7 @@
 #endif
 
 /* Define if you have RSVG library */
-#ifndef MAGICKCORE_RSVG_DELEGATE
-#define MAGICKCORE_RSVG_DELEGATE 1
-#endif
+/* #undef RSVG_DELEGATE */
 
 /* Define to the type of arg 1 for `select'. */
 #ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1458,9 +1444,7 @@
 
 
 /* Define if you have WEBP library */
-#ifndef MAGICKCORE_WEBP_DELEGATE
-#define MAGICKCORE_WEBP_DELEGATE 1
-#endif
+/* #undef WEBP_DELEGATE */
 
 /* Define to use the Windows GDI32 library */
 /* #undef WINGDI32_DELEGATE */
@@ -1469,9 +1453,7 @@
 /* #undef WITH_DMALLOC */
 
 /* Define if you have WMF library */
-#ifndef MAGICKCORE_WMF_DELEGATE
-#define MAGICKCORE_WMF_DELEGATE 1
-#endif
+/* #undef WMF_DELEGATE */
 
 /* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
    significant byte first (like Motorola and SPARC, unlike Intel). */
@@ -1527,8 +1509,7 @@
 /* #undef _MINIX */
 
 /* Define this for the OpenCL Accelerator */
-#ifndef MAGICKCORE__OPENCL
-#endif
+/* #undef _OPENCL */
 
 /* Define to 2 if the system does not provide POSIX.1 features except with
    this defined. */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index d5dc7ed7df9e328a2dfad1c64145f8e08b3dea1b..73dff8aafe8cfb0d92dfb1c9b6d2e5f67867d92b 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "5364"
+#define MagickSVNRevision  "5445"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-09-25"
+#define MagickReleaseDate  "2011-09-27"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index 8247e30ad9472a893a687e7181f52323c3df6f49..8a00f407c2b04a4394e8523386746181841f9a2b 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -50,6 +50,8 @@ MAGICKWAND_SOURCES = \
        MagickWand/mogrify-private.h \
        MagickWand/montage.c \
        MagickWand/montage.h \
+       MagickWand/operation.c \
+       MagickWand/operation.h \
        MagickWand/pixel-iterator.c \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.c \
@@ -79,6 +81,7 @@ MAGICKWAND_INCLUDE_HDRS = \
        MagickWand/magick-property.h \
        MagickWand/mogrify.h \
        MagickWand/montage.h \
+       MagickWand/operation.h \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.h \
        MagickWand/stream.h \

diff --git a/MagickWand/operation.c b/MagickWand/operation.c
index 140cf6f9bbe99226c740b1203af264c5ce0b8df5..078a0b49be348fe137629b445398fa862b1c277f 100644 (file)
--- a/MagickWand/operation.c
+++ b/MagickWand/operation.c
@@ -14,7 +14,7 @@
 %                                                                             %
 %                              Software Design                                %
 %                                John Cristy                                  %
-%                               September 2011                                   %
+%                               September 2011                                %
 %                                                                             %
 %                                                                             %
 %  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization      %
@@ -43,6 +43,7 @@
 %
 % Anthony Thyssen, Sept 2011
 */
+#if 0
 \f
 /*
   Include declarations.
@@ -401,7 +402,7 @@ static Image *SparseColorOption(const Image *image,
 %
 */
 WandExport MagickBooleanType SettingsOptionInfo(ImageInfo *image_info,
-  const int wand_unused(argc),const char **argv,ExceptionInfo *exception)
+  const int argc,const char **argv,ExceptionInfo *exception)
 {
   GeometryInfo
     geometry_info;
@@ -4949,4 +4950,4 @@ WandExport MagickBooleanType SequenceOperationImages(ImageInfo *image_info,
 
   return(status != 0 ? MagickTrue : MagickFalse);
 }
-
+#endif

diff --git a/Makefile.in b/Makefile.in
index 24d35a259add562132cea92944290263e88cce11..fc8031019d55889205c8a4f7a54fc03dbe45b8b2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -748,6 +748,7 @@ am__objects_18 = MagickWand/MagickWand_libMagickWand_la-animate.lo \
        MagickWand/MagickWand_libMagickWand_la-magick-wand.lo \
        MagickWand/MagickWand_libMagickWand_la-mogrify.lo \
        MagickWand/MagickWand_libMagickWand_la-montage.lo \
+       MagickWand/MagickWand_libMagickWand_la-operation.lo \
        MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo \
        MagickWand/MagickWand_libMagickWand_la-pixel-wand.lo \
        MagickWand/MagickWand_libMagickWand_la-stream.lo \
@@ -4295,6 +4296,8 @@ MAGICKWAND_SOURCES = \
        MagickWand/mogrify-private.h \
        MagickWand/montage.c \
        MagickWand/montage.h \
+       MagickWand/operation.c \
+       MagickWand/operation.h \
        MagickWand/pixel-iterator.c \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.c \
@@ -4324,6 +4327,7 @@ MAGICKWAND_INCLUDE_HDRS = \
        MagickWand/magick-property.h \
        MagickWand/mogrify.h \
        MagickWand/montage.h \
+       MagickWand/operation.h \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.h \
        MagickWand/stream.h \
@@ -5653,6 +5657,9 @@ MagickWand/MagickWand_libMagickWand_la-mogrify.lo:  \
 MagickWand/MagickWand_libMagickWand_la-montage.lo:  \
        MagickWand/$(am__dirstamp) \
        MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-operation.lo:  \
+       MagickWand/$(am__dirstamp) \
+       MagickWand/$(DEPDIR)/$(am__dirstamp)
 MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo:  \
        MagickWand/$(am__dirstamp) \
        MagickWand/$(DEPDIR)/$(am__dirstamp)
@@ -6764,6 +6771,8 @@ mostlyclean-compile:
        -rm -f MagickWand/MagickWand_libMagickWand_la-mogrify.lo
        -rm -f MagickWand/MagickWand_libMagickWand_la-montage.$(OBJEXT)
        -rm -f MagickWand/MagickWand_libMagickWand_la-montage.lo
+       -rm -f MagickWand/MagickWand_libMagickWand_la-operation.$(OBJEXT)
+       -rm -f MagickWand/MagickWand_libMagickWand_la-operation.lo
        -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-iterator.$(OBJEXT)
        -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo
        -rm -f MagickWand/MagickWand_libMagickWand_la-pixel-wand.$(OBJEXT)
@@ -7442,6 +7451,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-mogrify.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-montage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-operation.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-iterator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-wand.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-stream.Plo@am__quote@
@@ -9527,6 +9537,14 @@ MagickWand/MagickWand_libMagickWand_la-montage.lo: MagickWand/montage.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-montage.lo `test -f 'MagickWand/montage.c' || echo '$(srcdir)/'`MagickWand/montage.c
 
+MagickWand/MagickWand_libMagickWand_la-operation.lo: MagickWand/operation.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-operation.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-operation.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-operation.lo `test -f 'MagickWand/operation.c' || echo '$(srcdir)/'`MagickWand/operation.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-operation.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-operation.Plo
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='MagickWand/operation.c' object='MagickWand/MagickWand_libMagickWand_la-operation.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-operation.lo `test -f 'MagickWand/operation.c' || echo '$(srcdir)/'`MagickWand/operation.c
+
 MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo: MagickWand/pixel-iterator.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-iterator.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-pixel-iterator.lo `test -f 'MagickWand/pixel-iterator.c' || echo '$(srcdir)/'`MagickWand/pixel-iterator.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-iterator.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-pixel-iterator.Plo

diff --git a/config/configure.xml b/config/configure.xml
index 830ab5b9cb448dcaac92c4bc4c0f4befbe7c3df6..09960ee9ab4942cc99cc72db3ac774033688f745 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="5364" />
-  <configure name="RELEASE_DATE" value="2011-09-25"/>
+  <configure name="SVN_REVISION" value="5445" />
+  <configure name="RELEASE_DATE" value="2011-09-27"/>
   <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 127d1eeac1e4777723b918bb56f30a345cb21bc9..5ebe71cdc42b03762cd1ebaab666873816fd2002 100755 (executable)
--- a/configure
+++ b/configure
@@ -3584,7 +3584,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=5364
+MAGICK_SVN_REVISION=5445