(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 0eb2477eb50906064a9a65b07b111619dbbd6258..157b8eb9f9069fb5b916c0f1ba0328b8fba89f4e 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  "6788"
+#define MagickSVNRevision  "6837"
 #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-09"
+#define MagickReleaseDate  "2012-02-12"
 #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 1b54481c47f12743d9abeac1d80ceb00ee51b1d8..5f52b7056732133f97794280a71c32dcbe08f5b3 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -43,6 +43,8 @@ MAGICKWAND_SOURCES = \
        MagickWand/magick-image.h \
        MagickWand/magick-property.c \
        MagickWand/magick-property.h \
+       MagickWand/magick-cli.c \
+       MagickWand/magick-cli.h \
        MagickWand/magick-wand.c \
        MagickWand/magick-wand-private.h \
        MagickWand/mogrify.c \
@@ -77,6 +79,7 @@ MAGICKWAND_INCLUDE_HDRS = \
        MagickWand/drawing-wand.h \
        MagickWand/identify.h \
        MagickWand/import.h \
+       MagickWand/magick-cli.h \
        MagickWand/magick-image.h \
        MagickWand/magick-property.h \
        MagickWand/mogrify.h \

diff --git a/Makefile.in b/Makefile.in
index cb33c53460964d3cda989e83a958ded85ed8b24c..801ad63a13f983a2b3c112ee823ba319ae2b93fc 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -747,9 +747,9 @@ am__objects_18 = MagickWand/MagickWand_libMagickWand_la-animate.lo \
        MagickWand/MagickWand_libMagickWand_la-drawing-wand.lo \
        MagickWand/MagickWand_libMagickWand_la-identify.lo \
        MagickWand/MagickWand_libMagickWand_la-import.lo \
-       MagickWand/MagickWand_libMagickWand_la-magick-cli.lo \
        MagickWand/MagickWand_libMagickWand_la-magick-image.lo \
        MagickWand/MagickWand_libMagickWand_la-magick-property.lo \
+       MagickWand/MagickWand_libMagickWand_la-magick-cli.lo \
        MagickWand/MagickWand_libMagickWand_la-magick-wand.lo \
        MagickWand/MagickWand_libMagickWand_la-mogrify.lo \
        MagickWand/MagickWand_libMagickWand_la-montage.lo \
@@ -4347,12 +4347,12 @@ MAGICKWAND_SOURCES = \
        MagickWand/identify.h \
        MagickWand/import.c \
        MagickWand/import.h \
-       MagickWand/magick-cli.c \
-       MagickWand/magick-cli.h \
        MagickWand/magick-image.c \
        MagickWand/magick-image.h \
        MagickWand/magick-property.c \
        MagickWand/magick-property.h \
+       MagickWand/magick-cli.c \
+       MagickWand/magick-cli.h \
        MagickWand/magick-wand.c \
        MagickWand/magick-wand-private.h \
        MagickWand/mogrify.c \
@@ -5707,15 +5707,15 @@ MagickWand/MagickWand_libMagickWand_la-identify.lo:  \
 MagickWand/MagickWand_libMagickWand_la-import.lo:  \
        MagickWand/$(am__dirstamp) \
        MagickWand/$(DEPDIR)/$(am__dirstamp)
-MagickWand/MagickWand_libMagickWand_la-magick-cli.lo:  \
-       MagickWand/$(am__dirstamp) \
-       MagickWand/$(DEPDIR)/$(am__dirstamp)
 MagickWand/MagickWand_libMagickWand_la-magick-image.lo:  \
        MagickWand/$(am__dirstamp) \
        MagickWand/$(DEPDIR)/$(am__dirstamp)
 MagickWand/MagickWand_libMagickWand_la-magick-property.lo:  \
        MagickWand/$(am__dirstamp) \
        MagickWand/$(DEPDIR)/$(am__dirstamp)
+MagickWand/MagickWand_libMagickWand_la-magick-cli.lo:  \
+       MagickWand/$(am__dirstamp) \
+       MagickWand/$(DEPDIR)/$(am__dirstamp)
 MagickWand/MagickWand_libMagickWand_la-magick-wand.lo:  \
        MagickWand/$(am__dirstamp) \
        MagickWand/$(DEPDIR)/$(am__dirstamp)
@@ -7794,6 +7794,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/display.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/identify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/import.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/magick.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/mogrify.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/montage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/stream.Po@am__quote@
@@ -9341,13 +9342,6 @@ MagickWand/MagickWand_libMagickWand_la-import.lo: MagickWand/import.c
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-import.lo `test -f 'MagickWand/import.c' || echo '$(srcdir)/'`MagickWand/import.c
 
-MagickWand/MagickWand_libMagickWand_la-magick-cli.lo: MagickWand/magick-cli.c
-@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-cli.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-cli.lo `test -f 'MagickWand/magick-cli.c' || echo '$(srcdir)/'`MagickWand/magick-cli.c
-@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='MagickWand/magick-cli.c' object='MagickWand/MagickWand_libMagickWand_la-magick-cli.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-magick-cli.lo `test -f 'MagickWand/magick-cli.c' || echo '$(srcdir)/'`MagickWand/magick-cli.c
-
 MagickWand/MagickWand_libMagickWand_la-magick-image.lo: MagickWand/magick-image.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-image.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-image.lo `test -f 'MagickWand/magick-image.c' || echo '$(srcdir)/'`MagickWand/magick-image.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-image.Plo
@@ -9362,6 +9356,13 @@ MagickWand/MagickWand_libMagickWand_la-magick-property.lo: MagickWand/magick-pro
 @AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-magick-property.lo `test -f 'MagickWand/magick-property.c' || echo '$(srcdir)/'`MagickWand/magick-property.c
 
+MagickWand/MagickWand_libMagickWand_la-magick-cli.lo: MagickWand/magick-cli.c
+@am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-cli.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-cli.lo `test -f 'MagickWand/magick-cli.c' || echo '$(srcdir)/'`MagickWand/magick-cli.c
+@am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-cli.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      $(AM_V_CC)source='MagickWand/magick-cli.c' object='MagickWand/MagickWand_libMagickWand_la-magick-cli.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@      DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@  $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o MagickWand/MagickWand_libMagickWand_la-magick-cli.lo `test -f 'MagickWand/magick-cli.c' || echo '$(srcdir)/'`MagickWand/magick-cli.c
+
 MagickWand/MagickWand_libMagickWand_la-magick-wand.lo: MagickWand/magick-wand.c
 @am__fastdepCC_TRUE@   $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(MagickWand_libMagickWand_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT MagickWand/MagickWand_libMagickWand_la-magick-wand.lo -MD -MP -MF MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Tpo -c -o MagickWand/MagickWand_libMagickWand_la-magick-wand.lo `test -f 'MagickWand/magick-wand.c' || echo '$(srcdir)/'`MagickWand/magick-wand.c
 @am__fastdepCC_TRUE@   $(AM_V_at)$(am__mv) MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Tpo MagickWand/$(DEPDIR)/MagickWand_libMagickWand_la-magick-wand.Plo

diff --git a/config/configure.xml b/config/configure.xml
index 0e27bfc508b6f1f64fc67c2bcef44091a498eccd..4445825dd552a14a4e39b7721770ff6a087748da 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="6788" />
-  <configure name="RELEASE_DATE" value="2012-02-09"/>
+  <configure name="SVN_REVISION" value="6837" />
+  <configure name="RELEASE_DATE" value="2012-02-12"/>
   <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 fa414190393df0643ed7714d655721627f93fff9..64252b6b27e423f511dc155aed0dde294d2defee 100755 (executable)
--- a/configure
+++ b/configure
@@ -1919,7 +1919,7 @@ Optional Packages:
   --without-webp          disable WEBP support
   --with-windows-font-dir=DIR
                           directory containing MS-Windows fonts
-  --without-wmf           disable WMF support
+  --with-wmf              enable WMF support
   --without-xml           disable XML support
 
 Some influential environment variables:
@@ -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=6788
+MAGICK_SVN_REVISION=6837