(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 1b05cb1217ecb665af212b8795a4a4826a198179..813809e1b04c60a2a3427ca4274b0f4ed7005610 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  "6961"
+#define MagickSVNRevision  "6986"
 #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-02-25"
+#define MagickReleaseDate  "2012-02-28"
 #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 c24dedc791f9d1b443ef3f728477e9b5a1b88fb3..c5ac435bfc7108d45ca29053a7c36a19ae324cc5 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -55,6 +55,7 @@ MAGICKWAND_SOURCES = \
        MagickWand/montage.h \
        MagickWand/operation.c \
        MagickWand/operation.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-iterator.c \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.c \
@@ -95,6 +96,7 @@ MAGICKWAND_INCLUDE_HDRS = \
 MAGICKWAND_NOINST_HDRS = \
        MagickWand/mogrify-private.h \
        MagickWand/magick-wand-private.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-wand-private.h \
        MagickWand/studio.h \
        MagickWand/wand.h

diff --git a/Makefile.in b/Makefile.in
index d35eadc1c3e9ff5264a16996b3c4c3b19bb2507a..ae21a882ae9abcc18c3fd795426fb490612b518d 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4378,6 +4378,7 @@ MAGICKWAND_SOURCES = \
        MagickWand/montage.h \
        MagickWand/operation.c \
        MagickWand/operation.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-iterator.c \
        MagickWand/pixel-iterator.h \
        MagickWand/pixel-wand.c \
@@ -4418,6 +4419,7 @@ MAGICKWAND_INCLUDE_HDRS = \
 MAGICKWAND_NOINST_HDRS = \
        MagickWand/mogrify-private.h \
        MagickWand/magick-wand-private.h \
+       MagickWand/operation-private.h \
        MagickWand/pixel-wand-private.h \
        MagickWand/studio.h \
        MagickWand/wand.h

diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index 4e18ce82a86b6e8d3da32f02423694f2d4ce949f..570f5c33c35099bb05fd984feabada036330c33d 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-02-25</created>
+    <created>2012-02-28</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-02-25</created>
+          <created>2012-02-28</created>
           <revision>7.0.0</revision>
       </Version>
     </release>

diff --git a/config/configure.xml b/config/configure.xml
index 1a9d8e23b6a2815c8ab1ea90c62c7c73d3b1b45e..04616a19265711f0ebf23913c66222dd57d2fad1 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="6961" />
-  <configure name="RELEASE_DATE" value="2012-02-25"/>
+  <configure name="SVN_REVISION" value="6986" />
+  <configure name="RELEASE_DATE" value="2012-02-28"/>
   <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 0cc2afa7c0c1658969290549b4ae8306da830c70..ff9da4ba5d2cf811262c04e27ad0be26d8a78057 100755 (executable)
--- a/configure
+++ b/configure
@@ -3612,7 +3612,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=6961
+MAGICK_SVN_REVISION=6986