(no commit message)

diff --git a/Makefile.in b/Makefile.in
index 9f72477320757025d66ee400f56ba507a2391b79..03accc4600a88a8e08ecfebd37f9eedabe3021d2 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1712,6 +1712,7 @@ am__objects_19 = wand/wand_libMagickWand_la-animate.lo \
        wand/wand_libMagickWand_la-magick-wand.lo \
        wand/wand_libMagickWand_la-mogrify.lo \
        wand/wand_libMagickWand_la-montage.lo \
+       wand/wand_libMagickWand_la-operation.lo \
        wand/wand_libMagickWand_la-pixel-iterator.lo \
        wand/wand_libMagickWand_la-pixel-wand.lo \
        wand/wand_libMagickWand_la-stream.lo \
@@ -4252,6 +4253,8 @@ WAND_SOURCES = \
        wand/mogrify-private.h \
   wand/montage.c \
        wand/montage.h \
+       wand/operation.c \
+       wand/operation.h \
        wand/pixel-iterator.c \
        wand/pixel-iterator.h \
        wand/pixel-wand.c \
@@ -4277,6 +4280,7 @@ WAND_INCLUDE_HDRS = \
        wand/drawing-wand.h \
        wand/identify.h \
        wand/import.h \
+       wand/operation.h \
        wand/magick-image.h \
        wand/magick-property.h \
        wand/magick-wand.h \
@@ -6039,6 +6043,8 @@ wand/wand_libMagickWand_la-mogrify.lo: wand/$(am__dirstamp) \
        wand/$(DEPDIR)/$(am__dirstamp)
 wand/wand_libMagickWand_la-montage.lo: wand/$(am__dirstamp) \
        wand/$(DEPDIR)/$(am__dirstamp)
+wand/wand_libMagickWand_la-operation.lo: wand/$(am__dirstamp) \
+       wand/$(DEPDIR)/$(am__dirstamp)
 wand/wand_libMagickWand_la-pixel-iterator.lo: wand/$(am__dirstamp) \
        wand/$(DEPDIR)/$(am__dirstamp)
 wand/wand_libMagickWand_la-pixel-wand.lo: wand/$(am__dirstamp) \
@@ -7129,6 +7135,8 @@ mostlyclean-compile:
        -rm -f wand/wand_libMagickWand_la-mogrify.lo
        -rm -f wand/wand_libMagickWand_la-montage.$(OBJEXT)
        -rm -f wand/wand_libMagickWand_la-montage.lo
+       -rm -f wand/wand_libMagickWand_la-operation.$(OBJEXT)
+       -rm -f wand/wand_libMagickWand_la-operation.lo
        -rm -f wand/wand_libMagickWand_la-pixel-iterator.$(OBJEXT)
        -rm -f wand/wand_libMagickWand_la-pixel-iterator.lo
        -rm -f wand/wand_libMagickWand_la-pixel-wand.$(OBJEXT)
@@ -7553,6 +7561,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-magick-wand.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-mogrify.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-montage.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-operation.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-pixel-iterator.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-pixel-wand.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@wand/$(DEPDIR)/wand_libMagickWand_la-stream.Plo@am__quote@
@@ -10411,6 +10420,14 @@ wand/wand_libMagickWand_la-montage.lo: wand/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) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-montage.lo `test -f 'wand/montage.c' || echo '$(srcdir)/'`wand/montage.c
 
+wand/wand_libMagickWand_la-operation.lo: wand/operation.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-operation.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-operation.Tpo -c -o wand/wand_libMagickWand_la-operation.lo `test -f 'wand/operation.c' || echo '$(srcdir)/'`wand/operation.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-operation.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-operation.Plo
+@am__fastdepCC_FALSE@  $(AM_V_CC) @AM_BACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      source='wand/operation.c' object='wand/wand_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) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o wand/wand_libMagickWand_la-operation.lo `test -f 'wand/operation.c' || echo '$(srcdir)/'`wand/operation.c
+
 wand/wand_libMagickWand_la-pixel-iterator.lo: wand/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) $(wand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT wand/wand_libMagickWand_la-pixel-iterator.lo -MD -MP -MF wand/$(DEPDIR)/wand_libMagickWand_la-pixel-iterator.Tpo -c -o wand/wand_libMagickWand_la-pixel-iterator.lo `test -f 'wand/pixel-iterator.c' || echo '$(srcdir)/'`wand/pixel-iterator.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) wand/$(DEPDIR)/wand_libMagickWand_la-pixel-iterator.Tpo wand/$(DEPDIR)/wand_libMagickWand_la-pixel-iterator.Plo

diff --git a/config/configure.xml b/config/configure.xml
index 282c5a16cea413d1c688327ab62e1acf02e4f31a..fcd05c3129e167e195a751ddd5fac3ac60b53c8e 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="6.6.9"/>
   <configure name="LIB_VERSION" value="0x669"/>
   <configure name="LIB_VERSION_NUMBER" value="6,6,9,7"/>
-  <configure name="SVN_REVISION" value="4226" />
-  <configure name="RELEASE_DATE" value="2011-04-24"/>
+  <configure name="SVN_REVISION" value="4318" />
+  <configure name="RELEASE_DATE" value="2011-04-25"/>
   <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 813fabb397105f3da8a7ecd12a6b941399de2f8a..6dafe1cc784046dc780c0473105c62cc56ce1dc1 100755 (executable)
--- a/configure
+++ b/configure
@@ -3449,7 +3449,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=4226
+MAGICK_SVN_REVISION=4318
 
 
 

diff --git a/magick/version.h b/magick/version.h
index dfd397002df351633f98a006c70747976c105abf..38d995c9d4d5ff66bdd93dbc128b37a0682226f4 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  "4226"
+#define MagickSVNRevision  "4318"
 #define MagickLibVersion  0x669
 #define MagickLibVersionText  "6.6.9"
 #define MagickLibVersionNumber  4,0,1
 #define MagickLibAddendum  "-7"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-04-24"
-#define MagickChangeDate   "20110424"
+#define MagickReleaseDate  "2011-04-25"
+#define MagickChangeDate   "20110425"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "

diff --git a/wand/Makefile.am b/wand/Makefile.am
index 382ab2b52de0a2a14debefe3b0b1a714c0f7fbe3..0800f96a1f552d32d9bfa55e2ca5663f43dd5bc6 100644 (file)
--- a/wand/Makefile.am
+++ b/wand/Makefile.am
@@ -51,6 +51,8 @@ WAND_SOURCES = \
        wand/mogrify-private.h \
   wand/montage.c \
        wand/montage.h \
+       wand/operation.c \
+       wand/operation.h \
        wand/pixel-iterator.c \
        wand/pixel-iterator.h \
        wand/pixel-wand.c \
@@ -76,6 +78,7 @@ WAND_INCLUDE_HDRS = \
        wand/drawing-wand.h \
        wand/identify.h \
        wand/import.h \
+       wand/operation.h \
        wand/magick-image.h \
        wand/magick-property.h \
        wand/magick-wand.h \