(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 322e99ad9f3403f69ccd0ccc3b2a2cc253d43e4a..7003ff769a37c7ef36fe653f8af418c4f512dab0 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,15 +27,15 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9270:9275M"
+#define MagickSVNRevision  "9346:9348M"
 #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-09-08"
-#define MagickChangeDate   "20120904"
+#define MagickReleaseDate  "2012-09-12"
+#define MagickChangeDate   "20120911"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "

diff --git a/Makefile.in b/Makefile.in
index 690577f5d82bf3a28fe2a7f576b8e05434b55040..e7856cccd44482381c6293db6ab1904347ab54eb 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -243,10 +243,11 @@ DIST_COMMON = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \
        $(srcdir)/MagickCore/Makefile.am \
        $(srcdir)/MagickWand/Makefile.am $(srcdir)/Makefile.am \
        $(srcdir)/Makefile.in $(srcdir)/PerlMagick/Makefile.am \
-       $(srcdir)/coders/Makefile.am $(srcdir)/config/Makefile.am \
-       $(srcdir)/filters/Makefile.am $(srcdir)/ltdl/Makefile.inc \
-       $(srcdir)/m4/Makefile.am $(srcdir)/magick.sh.in \
-       $(srcdir)/tests/Makefile.am $(srcdir)/utilities/Makefile.am \
+       $(srcdir)/coders/Makefile.am $(srcdir)/common.shi.in \
+       $(srcdir)/config/Makefile.am $(srcdir)/filters/Makefile.am \
+       $(srcdir)/ltdl/Makefile.inc $(srcdir)/m4/Makefile.am \
+       $(srcdir)/magick.sh.in $(srcdir)/tests/Makefile.am \
+       $(srcdir)/utilities/Makefile.am \
        $(top_srcdir)/Magick++/bin/Magick++-config.in \
        $(top_srcdir)/Magick++/lib/ImageMagick++.pc.in \
        $(top_srcdir)/Magick++/lib/Magick++.pc.in \
@@ -276,7 +277,6 @@ DIST_COMMON = $(MagickCoreinc_HEADERS) $(MagickWandinc_HEADERS) \
        $(top_srcdir)/config/type-ghostscript.xml.in \
        $(top_srcdir)/config/type-windows.xml.in \
        $(top_srcdir)/config/type.xml.in $(top_srcdir)/configure \
-       $(top_srcdir)/tests/common.shi.in \
        $(top_srcdir)/utilities/ImageMagick.1.in \
        $(top_srcdir)/utilities/animate.1.in \
        $(top_srcdir)/utilities/compare.1.in \
@@ -326,16 +326,16 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
  configure.lineno config.status.lineno
 mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config/config.h
-CONFIG_CLEAN_FILES = config/configure.xml config/delegates.xml \
-       config/ImageMagick.rdf config/MagickCore.dox \
-       config/MagickWand.dox config/type-dejavu.xml \
-       config/type-ghostscript.xml config/type-windows.xml \
-       config/type.xml ImageMagick.spec Magick++/bin/Magick++-config \
-       MagickCore/ImageMagick.pc Magick++/lib/ImageMagick++.pc \
-       Magick++/lib/Magick++.pc MagickCore/MagickCore-config \
-       MagickCore/MagickCore.pc MagickCore/version.h magick.sh \
-       PerlMagick/Magick.pm PerlMagick/Makefile.PL \
-       PerlMagick/check.sh tests/common.shi utilities/animate.1 \
+CONFIG_CLEAN_FILES = common.shi config/configure.xml \
+       config/delegates.xml config/ImageMagick.rdf \
+       config/MagickCore.dox config/MagickWand.dox \
+       config/type-dejavu.xml config/type-ghostscript.xml \
+       config/type-windows.xml config/type.xml ImageMagick.spec \
+       Magick++/bin/Magick++-config MagickCore/ImageMagick.pc \
+       Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc \
+       MagickCore/MagickCore-config MagickCore/MagickCore.pc \
+       MagickCore/version.h magick.sh PerlMagick/Magick.pm \
+       PerlMagick/Makefile.PL PerlMagick/check.sh utilities/animate.1 \
        utilities/compare.1 utilities/composite.1 utilities/conjure.1 \
        utilities/convert.1 utilities/display.1 utilities/identify.1 \
        utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 \
@@ -4964,7 +4964,7 @@ TESTS_TESTS = \
        tests/wandtest.tap
 
 TESTS_EXTRA_DIST = \
-       tests/common.shi.in \
+       tests/common.shi \
   tests/input_256c.miff \
   tests/input_bilevel.miff \
   tests/input_gray.miff \
@@ -5108,6 +5108,8 @@ $(top_srcdir)/config/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
 
 distclean-hdr:
        -rm -f config/config.h config/stamp-h1
+common.shi: $(top_builddir)/config.status $(srcdir)/common.shi.in
+       cd $(top_builddir) && $(SHELL) ./config.status $@
 config/configure.xml: $(top_builddir)/config.status $(top_srcdir)/config/configure.xml.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 config/delegates.xml: $(top_builddir)/config.status $(top_srcdir)/config/delegates.xml.in
@@ -5150,8 +5152,6 @@ PerlMagick/Makefile.PL: $(top_builddir)/config.status $(top_srcdir)/PerlMagick/M
        cd $(top_builddir) && $(SHELL) ./config.status $@
 PerlMagick/check.sh: $(top_builddir)/config.status $(top_srcdir)/PerlMagick/check.sh.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
-tests/common.shi: $(top_builddir)/config.status $(top_srcdir)/tests/common.shi.in
-       cd $(top_builddir) && $(SHELL) ./config.status $@
 utilities/animate.1: $(top_builddir)/config.status $(top_srcdir)/utilities/animate.1.in
        cd $(top_builddir) && $(SHELL) ./config.status $@
 utilities/compare.1: $(top_builddir)/config.status $(top_srcdir)/utilities/compare.1.in

diff --git a/tests/common.shi.in b/common.shi.in
similarity index 100%
rename from tests/common.shi.in
rename to common.shi.in

diff --git a/configure b/configure
index b17826b8a4da9686c0b903b29fe4dc6b2c34fb1c..54819f3c7d2e26db1f705c2fdc3b42bd3a2761a6 100755 (executable)
--- a/configure
+++ b/configure
@@ -3503,7 +3503,7 @@ ac_config_headers="$ac_config_headers config/config.h"
 
 ac_config_commands="$ac_config_commands MagickCore/magick-config.h"
 
-ac_config_files="$ac_config_files config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config MagickCore/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc MagickCore/MagickCore-config MagickCore/MagickCore.pc MagickCore/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh tests/common.shi utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 MagickWand/MagickWand-config MagickWand/MagickWand.pc"
+ac_config_files="$ac_config_files common.shi config/configure.xml config/delegates.xml config/ImageMagick.rdf config/MagickCore.dox config/MagickWand.dox config/type-dejavu.xml config/type-ghostscript.xml config/type-windows.xml config/type.xml ImageMagick.spec Magick++/bin/Magick++-config MagickCore/ImageMagick.pc Magick++/lib/ImageMagick++.pc Magick++/lib/Magick++.pc MagickCore/MagickCore-config MagickCore/MagickCore.pc MagickCore/version.h Makefile magick.sh PerlMagick/Magick.pm PerlMagick/Makefile.PL PerlMagick/check.sh utilities/animate.1 utilities/compare.1 utilities/composite.1 utilities/conjure.1 utilities/convert.1 utilities/display.1 utilities/identify.1 utilities/ImageMagick.1 utilities/import.1 utilities/mogrify.1 utilities/montage.1 utilities/stream.1 MagickWand/MagickWand-config MagickWand/MagickWand.pc"
 
 
 #
@@ -3670,7 +3670,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=9270:9275M
+MAGICK_SVN_REVISION=9346:9348M
 
 
 
@@ -37153,6 +37153,7 @@ do
   case $ac_config_target in
     "config/config.h") CONFIG_HEADERS="$CONFIG_HEADERS config/config.h" ;;
     "MagickCore/magick-config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS MagickCore/magick-config.h" ;;
+    "common.shi") CONFIG_FILES="$CONFIG_FILES common.shi" ;;
     "config/configure.xml") CONFIG_FILES="$CONFIG_FILES config/configure.xml" ;;
     "config/delegates.xml") CONFIG_FILES="$CONFIG_FILES config/delegates.xml" ;;
     "config/ImageMagick.rdf") CONFIG_FILES="$CONFIG_FILES config/ImageMagick.rdf" ;;
@@ -37175,7 +37176,6 @@ do
     "PerlMagick/Magick.pm") CONFIG_FILES="$CONFIG_FILES PerlMagick/Magick.pm" ;;
     "PerlMagick/Makefile.PL") CONFIG_FILES="$CONFIG_FILES PerlMagick/Makefile.PL" ;;
     "PerlMagick/check.sh") CONFIG_FILES="$CONFIG_FILES PerlMagick/check.sh" ;;
-    "tests/common.shi") CONFIG_FILES="$CONFIG_FILES tests/common.shi" ;;
     "utilities/animate.1") CONFIG_FILES="$CONFIG_FILES utilities/animate.1" ;;
     "utilities/compare.1") CONFIG_FILES="$CONFIG_FILES utilities/compare.1" ;;
     "utilities/composite.1") CONFIG_FILES="$CONFIG_FILES utilities/composite.1" ;;

diff --git a/configure.ac b/configure.ac
index 1dca2f271a723a2a14522df51525e0f43ff361dd..cfbddbd2472f4bb364c2d19ea11c5a56ed3e3c31 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -37,6 +37,7 @@ AC_CONFIG_LIBOBJ_DIR([ltdl])
 AC_CONFIG_HEADERS([config/config.h])
 AX_PREFIX_CONFIG_H([MagickCore/magick-config.h],[MagickCore])
 AC_CONFIG_FILES([\
+    common.shi \
     config/configure.xml \
     config/delegates.xml \
     config/ImageMagick.rdf \
@@ -59,7 +60,6 @@ AC_CONFIG_FILES([\
     PerlMagick/Magick.pm \
     PerlMagick/Makefile.PL \
     PerlMagick/check.sh \
-    tests/common.shi \
     utilities/animate.1 \
     utilities/compare.1 \
     utilities/composite.1 \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 670e7613a36d968bd3b99c03a4e9260243dbf77b..6ed111e5e30c160c34d6a0a0ebc5d9c15e772489 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -49,7 +49,7 @@ TESTS_TESTS = \
        tests/wandtest.tap
 
 TESTS_EXTRA_DIST = \
-       tests/common.shi.in \
+       tests/common.shi \
   tests/input_256c.miff \
   tests/input_bilevel.miff \
   tests/input_gray.miff \

diff --git a/utilities/identify.1 b/utilities/identify.1
index 6d0cc3f53e0ee08adc0e2f9caa48a7835175884d..32a7c835a60f64c92f4ede4e6e4301fc3190008b 100644 (file)
--- a/utilities/identify.1
+++ b/utilities/identify.1
@@ -19,6 +19,7 @@ Image Settings:
   \-define unique=true  return the number of unique colors in the image
   \-density geometry    horizontal and vertical density of the image
   \-depth value         image depth
+  \-endian type         endianness (MSB or LSB) of the image
   \-extract geometry    extract area from image
   \-features distance   analyze image features (e.g. contrast, correlation)
   \-format "string"     output formatted image characteristics