From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 24 Feb 2012 00:33:24 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~6127
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd3c840a896164a842a89ae778ff86f3dbb71130;p=imagemagick

---

diff --git a/MagickCore/version.h b/MagickCore/version.h
index d757460a9..38c2fb1d0 100644
--- 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 d95c9a03b..d35eadc1c 100644
--- 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 ae959e321..041284adf 100644
--- 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 c8c3d46ba..f7fbe5f03 100755
--- 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 6042671ea..efc2541f2 100644
--- 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 384ac9a13..c20c21600 100644
--- 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)