(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index e0060f460dcf606e04faae387513dbb8fbf3ca1a..4da5ddc7a03691ea987bafb9f8655be6ff6b260e 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  "7277"
+#define MagickSVNRevision  "7318"
 #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-03-30"
+#define MagickReleaseDate  "2012-04-03"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index 2a0f669c418ca06c77df7107e314715c6c722f45..aeb9a010cd0fe1a3311ac66dd0e028d5eaaeeba0 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1772,10 +1772,10 @@ ltdl_shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        -o $@
 am__EXEEXT_1 = utilities/animate$(EXEEXT) utilities/compare$(EXEEXT) \
        utilities/composite$(EXEEXT) utilities/conjure$(EXEEXT) \
-       utilities/display$(EXEEXT) utilities/identify$(EXEEXT) \
-       utilities/import$(EXEEXT) utilities/magick$(EXEEXT) \
-       utilities/mogrify$(EXEEXT) utilities/montage$(EXEEXT) \
-       utilities/stream$(EXEEXT)
+       utilities/convert$(EXEEXT) utilities/display$(EXEEXT) \
+       utilities/identify$(EXEEXT) utilities/import$(EXEEXT) \
+       utilities/magick$(EXEEXT) utilities/mogrify$(EXEEXT) \
+       utilities/montage$(EXEEXT) utilities/stream$(EXEEXT)
 am__EXEEXT_2 = tests/validate$(EXEEXT)
 am__EXEEXT_3 = Magick++/demo/analyze$(EXEEXT) \
        Magick++/demo/button$(EXEEXT) Magick++/demo/demo$(EXEEXT) \
@@ -1931,6 +1931,13 @@ utilities_conjure_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_conjure_LDFLAGS) $(LDFLAGS) \
        -o $@
+am_utilities_convert_OBJECTS = utilities/convert.$(OBJEXT)
+utilities_convert_OBJECTS = $(am_utilities_convert_OBJECTS)
+utilities_convert_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_convert_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+       $(AM_CFLAGS) $(CFLAGS) $(utilities_convert_LDFLAGS) $(LDFLAGS) \
+       -o $@
 am_utilities_display_OBJECTS = utilities/display.$(OBJEXT)
 utilities_display_OBJECTS = $(am_utilities_display_OBJECTS)
 utilities_display_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
@@ -2111,10 +2118,11 @@ SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_SOURCES) \
        $(tests_validate_SOURCES) $(utilities_animate_SOURCES) \
        $(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \
-       $(utilities_conjure_SOURCES) $(utilities_display_SOURCES) \
-       $(utilities_identify_SOURCES) $(utilities_import_SOURCES) \
-       $(utilities_magick_SOURCES) $(utilities_mogrify_SOURCES) \
-       $(utilities_montage_SOURCES) $(utilities_stream_SOURCES)
+       $(utilities_conjure_SOURCES) $(utilities_convert_SOURCES) \
+       $(utilities_display_SOURCES) $(utilities_identify_SOURCES) \
+       $(utilities_import_SOURCES) $(utilities_magick_SOURCES) \
+       $(utilities_mogrify_SOURCES) $(utilities_montage_SOURCES) \
+       $(utilities_stream_SOURCES)
 DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(am__MagickCore_libMagickCore_la_SOURCES_DIST) \
        $(MagickWand_libMagickWand_la_SOURCES) \
@@ -2202,10 +2210,11 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_SOURCES) \
        $(tests_validate_SOURCES) $(utilities_animate_SOURCES) \
        $(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \
-       $(utilities_conjure_SOURCES) $(utilities_display_SOURCES) \
-       $(utilities_identify_SOURCES) $(utilities_import_SOURCES) \
-       $(utilities_magick_SOURCES) $(utilities_mogrify_SOURCES) \
-       $(utilities_montage_SOURCES) $(utilities_stream_SOURCES)
+       $(utilities_conjure_SOURCES) $(utilities_convert_SOURCES) \
+       $(utilities_display_SOURCES) $(utilities_identify_SOURCES) \
+       $(utilities_import_SOURCES) $(utilities_magick_SOURCES) \
+       $(utilities_mogrify_SOURCES) $(utilities_montage_SOURCES) \
+       $(utilities_stream_SOURCES)
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
@@ -4737,6 +4746,7 @@ UTILITIES_PGMS = \
        utilities/compare \
        utilities/composite \
        utilities/conjure \
+       utilities/convert \
        utilities/display \
        utilities/identify \
        utilities/import \
@@ -4761,6 +4771,9 @@ utilities_composite_SOURCES = utilities/composite.c
 utilities_conjure_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_conjure_LDFLAGS = $(LDFLAGS)
 utilities_conjure_SOURCES = utilities/conjure.c
+utilities_convert_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_convert_LDFLAGS = $(LDFLAGS)
+utilities_convert_SOURCES = utilities/convert.c
 utilities_display_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_display_LDFLAGS = $(LDFLAGS)
 utilities_display_SOURCES = utilities/display.c
@@ -4819,7 +4832,7 @@ UTILITIES_EXTRA_DIST = \
 UTILITIES_CLEANFILES = 
 
 # Link these utilities to 'magick'.
-MAGICK_UTILITIES = convert magick-script
+MAGICK_UTILITIES = magick-script
 UTILITIES_INSTALL_EXEC_LOCAL_TARGETS = install-exec-local-utilities
 UTILITIES_UNINSTALL_LOCAL_TARGETS = uninstall-local-utilities
 TESTS_CHECK_PGRMS = \
@@ -6564,6 +6577,11 @@ utilities/conjure.$(OBJEXT): utilities/$(am__dirstamp) \
 utilities/conjure$(EXEEXT): $(utilities_conjure_OBJECTS) $(utilities_conjure_DEPENDENCIES) $(EXTRA_utilities_conjure_DEPENDENCIES) utilities/$(am__dirstamp)
        @rm -f utilities/conjure$(EXEEXT)
        $(AM_V_CCLD)$(utilities_conjure_LINK) $(utilities_conjure_OBJECTS) $(utilities_conjure_LDADD) $(LIBS)
+utilities/convert.$(OBJEXT): utilities/$(am__dirstamp) \
+       utilities/$(DEPDIR)/$(am__dirstamp)
+utilities/convert$(EXEEXT): $(utilities_convert_OBJECTS) $(utilities_convert_DEPENDENCIES) $(EXTRA_utilities_convert_DEPENDENCIES) utilities/$(am__dirstamp)
+       @rm -f utilities/convert$(EXEEXT)
+       $(AM_V_CCLD)$(utilities_convert_LINK) $(utilities_convert_OBJECTS) $(utilities_convert_LDADD) $(LIBS)
 utilities/display.$(OBJEXT): utilities/$(am__dirstamp) \
        utilities/$(DEPDIR)/$(am__dirstamp)
 utilities/display$(EXEEXT): $(utilities_display_OBJECTS) $(utilities_display_DEPENDENCIES) $(EXTRA_utilities_display_DEPENDENCIES) utilities/$(am__dirstamp)
@@ -7434,6 +7452,7 @@ mostlyclean-compile:
        -rm -f utilities/compare.$(OBJEXT)
        -rm -f utilities/composite.$(OBJEXT)
        -rm -f utilities/conjure.$(OBJEXT)
+       -rm -f utilities/convert.$(OBJEXT)
        -rm -f utilities/display.$(OBJEXT)
        -rm -f utilities/identify.$(OBJEXT)
        -rm -f utilities/import.$(OBJEXT)
@@ -7859,6 +7878,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/compare.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/composite.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/conjure.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/convert.Po@am__quote@
 @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@

diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf
index aef1ea23b56c44e7fc377793b994e5b7ae3a8f9e..132e49add77c4a7ad560a408fad5209d5c463da4 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-03-30</created>
+    <created>2012-04-03</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-03-30</created>
+          <created>2012-04-03</created>
           <revision>7.0.0</revision>
       </Version>
     </release>

diff --git a/config/configure.xml b/config/configure.xml
index 42bd0c8ce4af84a04c7ddf153a39d13da6911392..a90a190b2cdffea5e7e38f8b6fd0d188f86762f6 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="7277" />
-  <configure name="RELEASE_DATE" value="2012-03-30"/>
+  <configure name="SVN_REVISION" value="7318" />
+  <configure name="RELEASE_DATE" value="2012-04-03"/>
   <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 8bca937d1af4e03c0b7def6443495457b0da0896..0a6747cca1073946910c5db32a843443d4fc21ad 100755 (executable)
--- a/configure
+++ b/configure
@@ -3621,7 +3621,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=7277
+MAGICK_SVN_REVISION=7318
 
 
 

diff --git a/utilities/Makefile.am b/utilities/Makefile.am
index 9401d528b3695cee99075f726a294bb2f4f6ff88..19669e24092f202578f86bf350c90d6a2be8f8ee 100644 (file)
--- a/utilities/Makefile.am
+++ b/utilities/Makefile.am
@@ -19,6 +19,7 @@ UTILITIES_PGMS = \
        utilities/compare \
        utilities/composite \
        utilities/conjure \
+       utilities/convert \
        utilities/display \
        utilities/identify \
        utilities/import \
@@ -47,6 +48,10 @@ utilities_conjure_LDADD      = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_conjure_LDFLAGS      = $(LDFLAGS)
 utilities_conjure_SOURCES      = utilities/conjure.c
 
+utilities_convert_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_convert_LDFLAGS      = $(LDFLAGS)
+utilities_convert_SOURCES      = utilities/convert.c
+
 utilities_display_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_display_LDFLAGS      = $(LDFLAGS)
 utilities_display_SOURCES      = utilities/display.c
@@ -112,7 +117,7 @@ UTILITIES_EXTRA_DIST = \
 UTILITIES_CLEANFILES = 
 
 # Link these utilities to 'magick'.
-MAGICK_UTILITIES=convert magick-script
+MAGICK_UTILITIES=magick-script
 UTILITIES_INSTALL_EXEC_LOCAL_TARGETS=install-exec-local-utilities
 install-exec-local-utilities:
        $(mkdir_p) $(DESTDIR)$(bindir)