(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index d757460a99f2194f21caf81e2b27243d7ec85ea0..38c2fb1d0fc71334a34fa2032da39d33a043384b 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  "6934"
+#define MagickSVNRevision  "6954"
 #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-21"
+#define MagickReleaseDate  "2012-02-23"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index d95c9a03b5084bf9cc8ae6e679dce519cbd4dc4f..d35eadc1c3e9ff5264a16996b3c4c3b19bb2507a 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -11417,7 +11417,7 @@ $(DIST_WINDOWS_SRC_ZIP) $(DIST_WINDOWS_SRC_7ZIP) windows-dist:
 @P7ZIP_DELEGATE_TRUE@  chmod 644 $(DIST_WINDOWS_SRC_7ZIP)
        rm -rf $(PACKAGE_NAME)-$(PACKAGE_VERSION)$(PACKAGE_VERSION_ADDENDUM)
 @RPM_DELEGATE_TRUE@.PHONY: srpm
-@RPM_DELEGATE_TRUE@$(DIST_ARCHIVE_SRPM) srpm: dist
+@RPM_DELEGATE_TRUE@$(DIST_ARCHIVE_SRPM) srpm: dist-bzip2
 @RPM_DELEGATE_TRUE@    rm -f $(DIST_ARCHIVE_SRPM)
 @RPM_DELEGATE_TRUE@    $(RPM) --define="_sourcedir `pwd`" --define="_srcrpmdir `pwd`" --nodeps --bs ImageMagick.spec
 @RPM_DELEGATE_TRUE@    @echo ==============================================================

diff --git a/config/configure.xml b/config/configure.xml
index ae959e3212a1fde1c85ac35277024a703ab1860a..041284adffca78ad3b3308cec12b7f15ec20449c 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="6934" />
-  <configure name="RELEASE_DATE" value="2012-02-21"/>
+  <configure name="SVN_REVISION" value="6954" />
+  <configure name="RELEASE_DATE" value="2012-02-23"/>
   <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 c8c3d46bafc5dcd0617e495ce0cdecbc7d7cce0f..f7fbe5f032881131e1ff5d7bbdfcb6656d44dfaa 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=6934
+MAGICK_SVN_REVISION=6954
 
 
 

diff --git a/utilities/convert.1 b/utilities/convert.1
index 6042671ea15382fbbf10c14dba02e93aff3f6b3a..efc2541f20bff3b43d200abae05ce3254a10ecea 100644 (file)
--- a/utilities/convert.1
+++ b/utilities/convert.1
@@ -225,6 +225,15 @@ Image Operators:
   \-white-threshold value
                        force all pixels above the threshold into white
 
+
+Image Channel Operators:
+  \-channel-extract channel-list
+                        extract the channels in order
+  \-channel-inject channel-list
+                        inject the channels in order
+  \-channel-swap channel,channel
+                        swap the channels
+
 Image Sequence Operators:
   \-affinity filename   transform image colors to match this set of colors
   \-append              append an image sequence top to bottom (use +append for left to right)

diff --git a/utilities/mogrify.1 b/utilities/mogrify.1
index 384ac9a130dd387d0672e036217e56b8d28e3167..c20c2160042a80653dcf26e882b0e4eca388bae5 100644 (file)
--- a/utilities/mogrify.1
+++ b/utilities/mogrify.1
@@ -227,6 +227,14 @@ Image Operators:
   \-white-threshold value
                        force all pixels above the threshold into white
 
+Image Channel Operators:
+  \-channel-extract channel-list
+                        extract the channels in order
+  \-channel-inject channel-list
+                        inject the channels in order
+  \-channel-swap channel,channel
+                        swap the channels
+
 Image Sequence Operators:
   \-affinity filename   transform image colors to match this set of colors
   \-append              append an image sequence top to botto (use +append for left to right)