]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Tue, 20 Mar 2012 17:05:01 +0000 (17:05 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Tue, 20 Mar 2012 17:05:01 +0000 (17:05 +0000)
Install-unix.txt
MagickCore/version.h
Makefile.in
config/ImageMagick.rdf
config/configure.xml
configure
configure.ac
utilities/Makefile.am
utilities/magick.1 [new file with mode: 0644]
utilities/magick.1.in [new file with mode: 0644]
www/magick.html [new file with mode: 0644]

index e5d0df25746044b801aeacb594b3229b387cde88..8a9c65a4acf0f2f065ac5f70b537a5724451eb8f 100644 (file)
@@ -251,6 +251,9 @@ Configure
       compilation options for large files in order to use the library.
   
   Here are the optional packages you can configure:
+
+    --enable-legacy-support
+      install legacy command-line utilities (default disabled).
   
     --with-quantum-depth
       number of bits in a pixel quantum (default 16).
index 276d3c62874f201c5e33f2d7186780056c53e4f0..17c3eca38cf346744e59a52b7c09f90a194043c3 100644 (file)
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "7174"
+#define MagickSVNRevision  "7178"
 #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-19"
+#define MagickReleaseDate  "2012-03-20"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
index f156a2a87064374f2cb9b3c1c591a7f70c8f70cb..06557993b25e81b7cc22ad0875cbd588ddb849a2 100644 (file)
@@ -1770,12 +1770,30 @@ ltdl_shl_load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(ltdl_shl_load_la_LDFLAGS) $(LDFLAGS) \
        -o $@
-am__EXEEXT_1 = utilities/animate$(EXEEXT) utilities/compare$(EXEEXT) \
-       utilities/composite$(EXEEXT) utilities/conjure$(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)
+@LEGACY_SUPPORT_FALSE@am__EXEEXT_1 = utilities/animate$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/compare$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/composite$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/conjure$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/convert$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/display$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/identify$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/import$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/magick$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/mogrify$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/montage$(EXEEXT) \
+@LEGACY_SUPPORT_FALSE@ utilities/stream$(EXEEXT)
+@LEGACY_SUPPORT_TRUE@am__EXEEXT_1 = utilities/animate$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/compare$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/composite$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/conjure$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/convert$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/display$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/identify$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/import$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/magick$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/mogrify$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/montage$(EXEEXT) \
+@LEGACY_SUPPORT_TRUE@  utilities/stream$(EXEEXT)
 am__EXEEXT_2 = tests/validate$(EXEEXT)
 am__EXEEXT_3 = Magick++/demo/analyze$(EXEEXT) \
        Magick++/demo/button$(EXEEXT) Magick++/demo/demo$(EXEEXT) \
@@ -1902,88 +1920,166 @@ MagickWand_wandtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 am_tests_validate_OBJECTS = tests/tests_validate-validate.$(OBJEXT)
 tests_validate_OBJECTS = $(am_tests_validate_OBJECTS)
 tests_validate_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-am_utilities_animate_OBJECTS = utilities/animate.$(OBJEXT)
+am__utilities_animate_SOURCES_DIST = utilities/animate.c
+@LEGACY_SUPPORT_FALSE@am_utilities_animate_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/animate.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_animate_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/animate.$(OBJEXT)
 utilities_animate_OBJECTS = $(am_utilities_animate_OBJECTS)
-utilities_animate_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_animate_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_animate_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_animate_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_animate_LDFLAGS) $(LDFLAGS) \
        -o $@
-am_utilities_compare_OBJECTS = utilities/compare.$(OBJEXT)
+am__utilities_compare_SOURCES_DIST = utilities/compare.c
+@LEGACY_SUPPORT_FALSE@am_utilities_compare_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/compare.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_compare_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/compare.$(OBJEXT)
 utilities_compare_OBJECTS = $(am_utilities_compare_OBJECTS)
-utilities_compare_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_compare_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_compare_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_compare_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_compare_LDFLAGS) $(LDFLAGS) \
        -o $@
-am_utilities_composite_OBJECTS = utilities/composite.$(OBJEXT)
+am__utilities_composite_SOURCES_DIST = utilities/composite.c
+@LEGACY_SUPPORT_FALSE@am_utilities_composite_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/composite.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_composite_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/composite.$(OBJEXT)
 utilities_composite_OBJECTS = $(am_utilities_composite_OBJECTS)
-utilities_composite_DEPENDENCIES = $(MAGICKCORE_LIBS) \
-       $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_composite_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_composite_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_composite_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_composite_LDFLAGS) \
        $(LDFLAGS) -o $@
-am_utilities_conjure_OBJECTS = utilities/conjure.$(OBJEXT)
+am__utilities_conjure_SOURCES_DIST = utilities/conjure.c
+@LEGACY_SUPPORT_FALSE@am_utilities_conjure_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/conjure.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_conjure_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/conjure.$(OBJEXT)
 utilities_conjure_OBJECTS = $(am_utilities_conjure_OBJECTS)
-utilities_conjure_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_conjure_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_conjure_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 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)
+am__utilities_convert_SOURCES_DIST = utilities/convert.c
+@LEGACY_SUPPORT_TRUE@am_utilities_convert_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/convert.$(OBJEXT)
 utilities_convert_OBJECTS = $(am_utilities_convert_OBJECTS)
-utilities_convert_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_convert_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(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)
+am__utilities_display_SOURCES_DIST = utilities/display.c
+@LEGACY_SUPPORT_FALSE@am_utilities_display_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/display.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_display_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/display.$(OBJEXT)
 utilities_display_OBJECTS = $(am_utilities_display_OBJECTS)
-utilities_display_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_display_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_display_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_display_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_display_LDFLAGS) $(LDFLAGS) \
        -o $@
-am_utilities_identify_OBJECTS = utilities/identify.$(OBJEXT)
+am__utilities_identify_SOURCES_DIST = utilities/identify.c
+@LEGACY_SUPPORT_FALSE@am_utilities_identify_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/identify.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_identify_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/identify.$(OBJEXT)
 utilities_identify_OBJECTS = $(am_utilities_identify_OBJECTS)
-utilities_identify_DEPENDENCIES = $(MAGICKCORE_LIBS) \
-       $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_identify_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_identify_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_identify_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_identify_LDFLAGS) \
        $(LDFLAGS) -o $@
-am_utilities_import_OBJECTS = utilities/import.$(OBJEXT)
+am__utilities_import_SOURCES_DIST = utilities/import.c
+@LEGACY_SUPPORT_FALSE@am_utilities_import_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/import.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_import_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/import.$(OBJEXT)
 utilities_import_OBJECTS = $(am_utilities_import_OBJECTS)
-utilities_import_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_import_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_import_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_import_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_import_LDFLAGS) $(LDFLAGS) \
        -o $@
-am_utilities_magick_OBJECTS = utilities/magick.$(OBJEXT)
+am__utilities_magick_SOURCES_DIST = utilities/magick.c
+@LEGACY_SUPPORT_FALSE@am_utilities_magick_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/magick.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_magick_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/magick.$(OBJEXT)
 utilities_magick_OBJECTS = $(am_utilities_magick_OBJECTS)
-utilities_magick_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_magick_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_magick_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_magick_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_magick_LDFLAGS) $(LDFLAGS) \
        -o $@
-am_utilities_mogrify_OBJECTS = utilities/mogrify.$(OBJEXT)
+am__utilities_mogrify_SOURCES_DIST = utilities/mogrify.c
+@LEGACY_SUPPORT_FALSE@am_utilities_mogrify_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/mogrify.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_mogrify_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/mogrify.$(OBJEXT)
 utilities_mogrify_OBJECTS = $(am_utilities_mogrify_OBJECTS)
-utilities_mogrify_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_mogrify_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_mogrify_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_mogrify_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_mogrify_LDFLAGS) $(LDFLAGS) \
        -o $@
-am_utilities_montage_OBJECTS = utilities/montage.$(OBJEXT)
+am__utilities_montage_SOURCES_DIST = utilities/montage.c
+@LEGACY_SUPPORT_FALSE@am_utilities_montage_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/montage.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_montage_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/montage.$(OBJEXT)
 utilities_montage_OBJECTS = $(am_utilities_montage_OBJECTS)
-utilities_montage_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_montage_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_montage_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_montage_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_montage_LDFLAGS) $(LDFLAGS) \
        -o $@
-am_utilities_stream_OBJECTS = utilities/stream.$(OBJEXT)
+am__utilities_stream_SOURCES_DIST = utilities/stream.c
+@LEGACY_SUPPORT_FALSE@am_utilities_stream_OBJECTS =  \
+@LEGACY_SUPPORT_FALSE@ utilities/stream.$(OBJEXT)
+@LEGACY_SUPPORT_TRUE@am_utilities_stream_OBJECTS =  \
+@LEGACY_SUPPORT_TRUE@  utilities/stream.$(OBJEXT)
 utilities_stream_OBJECTS = $(am_utilities_stream_OBJECTS)
-utilities_stream_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_stream_DEPENDENCIES =  \
+@LEGACY_SUPPORT_FALSE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_stream_DEPENDENCIES =  \
+@LEGACY_SUPPORT_TRUE@  $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_stream_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(utilities_stream_LDFLAGS) $(LDFLAGS) \
@@ -2208,13 +2304,19 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \
        $(Magick___tests_readWriteBlob_SOURCES) \
        $(Magick___tests_readWriteImages_SOURCES) \
        $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_SOURCES) \
-       $(tests_validate_SOURCES) $(utilities_animate_SOURCES) \
-       $(utilities_compare_SOURCES) $(utilities_composite_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)
+       $(tests_validate_SOURCES) \
+       $(am__utilities_animate_SOURCES_DIST) \
+       $(am__utilities_compare_SOURCES_DIST) \
+       $(am__utilities_composite_SOURCES_DIST) \
+       $(am__utilities_conjure_SOURCES_DIST) \
+       $(am__utilities_convert_SOURCES_DIST) \
+       $(am__utilities_display_SOURCES_DIST) \
+       $(am__utilities_identify_SOURCES_DIST) \
+       $(am__utilities_import_SOURCES_DIST) \
+       $(am__utilities_magick_SOURCES_DIST) \
+       $(am__utilities_mogrify_SOURCES_DIST) \
+       $(am__utilities_montage_SOURCES_DIST) \
+       $(am__utilities_stream_SOURCES_DIST)
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
@@ -4741,87 +4843,164 @@ filters_analyze_la_SOURCES = filters/analyze.c
 filters_analyze_la_CPPFLAGS = $(MODULE_EXTRA_CPPFLAGS)
 filters_analyze_la_LDFLAGS = $(MODULECOMMONFLAGS)
 filters_analyze_la_LIBADD = $(MAGICKCORE_LIBS) $(MATH_LIBS)
-UTILITIES_PGMS = \
-       utilities/animate \
-       utilities/compare \
-       utilities/composite \
-       utilities/conjure \
-       utilities/convert \
-       utilities/display \
-       utilities/identify \
-       utilities/import \
-       utilities/magick \
-       utilities/mogrify \
-       utilities/montage \
-       utilities/stream
+@LEGACY_SUPPORT_FALSE@UTILITIES_PGMS = \
+@LEGACY_SUPPORT_FALSE@ utilities/animate \
+@LEGACY_SUPPORT_FALSE@ utilities/compare \
+@LEGACY_SUPPORT_FALSE@ utilities/composite \
+@LEGACY_SUPPORT_FALSE@ utilities/conjure \
+@LEGACY_SUPPORT_FALSE@ utilities/convert \
+@LEGACY_SUPPORT_FALSE@ utilities/display \
+@LEGACY_SUPPORT_FALSE@ utilities/identify \
+@LEGACY_SUPPORT_FALSE@ utilities/import \
+@LEGACY_SUPPORT_FALSE@ utilities/magick \
+@LEGACY_SUPPORT_FALSE@ utilities/mogrify \
+@LEGACY_SUPPORT_FALSE@ utilities/montage \
+@LEGACY_SUPPORT_FALSE@ utilities/stream
+
+@LEGACY_SUPPORT_TRUE@UTILITIES_PGMS = \
+@LEGACY_SUPPORT_TRUE@  utilities/animate \
+@LEGACY_SUPPORT_TRUE@  utilities/compare \
+@LEGACY_SUPPORT_TRUE@  utilities/composite \
+@LEGACY_SUPPORT_TRUE@  utilities/conjure \
+@LEGACY_SUPPORT_TRUE@  utilities/convert \
+@LEGACY_SUPPORT_TRUE@  utilities/display \
+@LEGACY_SUPPORT_TRUE@  utilities/identify \
+@LEGACY_SUPPORT_TRUE@  utilities/import \
+@LEGACY_SUPPORT_TRUE@  utilities/magick \
+@LEGACY_SUPPORT_TRUE@  utilities/mogrify \
+@LEGACY_SUPPORT_TRUE@  utilities/montage \
+@LEGACY_SUPPORT_TRUE@  utilities/stream
 
 UTILITIES_XFAIL_TESTS = \
   $(UTILITIES_TTF_XFAIL_TESTS) \
   $(UTILITIES_XML_XFAIL_TESTS)
 
-utilities_animate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_animate_LDFLAGS = $(LDFLAGS)
-utilities_animate_SOURCES = utilities/animate.c
-utilities_compare_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_compare_LDFLAGS = $(LDFLAGS)
-utilities_compare_SOURCES = utilities/compare.c
-utilities_composite_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_composite_LDFLAGS = $(LDFLAGS)
-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
-utilities_identify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_identify_LDFLAGS = $(LDFLAGS)
-utilities_identify_SOURCES = utilities/identify.c
-utilities_import_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_import_LDFLAGS = $(LDFLAGS)
-utilities_import_SOURCES = utilities/import.c
-utilities_magick_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_magick_LDFLAGS = $(LDFLAGS)
-utilities_magick_SOURCES = utilities/magick.c
-utilities_mogrify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_mogrify_LDFLAGS = $(LDFLAGS)
-utilities_mogrify_SOURCES = utilities/mogrify.c
-utilities_montage_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_montage_LDFLAGS = $(LDFLAGS)
-utilities_montage_SOURCES = utilities/montage.c
-utilities_stream_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
-utilities_stream_LDFLAGS = $(LDFLAGS)
-utilities_stream_SOURCES = utilities/stream.c
-UTILITIES_MANS = \
-       utilities/ImageMagick.1 \
-       utilities/animate.1 \
-       utilities/compare.1 \
-       utilities/composite.1 \
-       utilities/conjure.1 \
-       utilities/convert.1 \
-       utilities/display.1 \
-       utilities/identify.1 \
-       utilities/import.1 \
-       utilities/mogrify.1 \
-       utilities/montage.1 \
-       utilities/stream.1
-
-UTILITIES_CONFIGURE = \
-       utilities/ImageMagick.1.in \
-       utilities/animate.1.in \
-       utilities/compare.1.in \
-       utilities/composite.1.in \
-       utilities/conjure.1.in \
-       utilities/convert.1.in \
-       utilities/display.1.in \
-       utilities/identify.1.in \
-       utilities/import.1.in \
-       utilities/mogrify.1.in \
-       utilities/montage.1.in \
-       utilities/stream.1.in
+@LEGACY_SUPPORT_FALSE@utilities_animate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_animate_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_animate_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_animate_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_animate_SOURCES = utilities/animate.c
+@LEGACY_SUPPORT_TRUE@utilities_animate_SOURCES = utilities/animate.c
+@LEGACY_SUPPORT_FALSE@utilities_compare_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_compare_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_compare_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_compare_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_compare_SOURCES = utilities/compare.c
+@LEGACY_SUPPORT_TRUE@utilities_compare_SOURCES = utilities/compare.c
+@LEGACY_SUPPORT_FALSE@utilities_composite_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_composite_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_composite_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_composite_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_composite_SOURCES = utilities/composite.c
+@LEGACY_SUPPORT_TRUE@utilities_composite_SOURCES = utilities/composite.c
+@LEGACY_SUPPORT_FALSE@utilities_conjure_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_conjure_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_conjure_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_conjure_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_conjure_SOURCES = utilities/conjure.c
+@LEGACY_SUPPORT_TRUE@utilities_conjure_SOURCES = utilities/conjure.c
+@LEGACY_SUPPORT_TRUE@utilities_convert_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_convert_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_convert_SOURCES = utilities/convert.c
+@LEGACY_SUPPORT_FALSE@utilities_display_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_display_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_display_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_display_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_display_SOURCES = utilities/display.c
+@LEGACY_SUPPORT_TRUE@utilities_display_SOURCES = utilities/display.c
+@LEGACY_SUPPORT_FALSE@utilities_identify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_identify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_identify_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_identify_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_identify_SOURCES = utilities/identify.c
+@LEGACY_SUPPORT_TRUE@utilities_identify_SOURCES = utilities/identify.c
+@LEGACY_SUPPORT_FALSE@utilities_import_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_import_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_import_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_import_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_import_SOURCES = utilities/import.c
+@LEGACY_SUPPORT_TRUE@utilities_import_SOURCES = utilities/import.c
+@LEGACY_SUPPORT_FALSE@utilities_magick_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_magick_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_magick_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_magick_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_magick_SOURCES = utilities/magick.c
+@LEGACY_SUPPORT_TRUE@utilities_magick_SOURCES = utilities/magick.c
+@LEGACY_SUPPORT_FALSE@utilities_mogrify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_mogrify_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_mogrify_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_mogrify_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_mogrify_SOURCES = utilities/mogrify.c
+@LEGACY_SUPPORT_TRUE@utilities_mogrify_SOURCES = utilities/mogrify.c
+@LEGACY_SUPPORT_FALSE@utilities_montage_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_montage_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_montage_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_montage_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_montage_SOURCES = utilities/montage.c
+@LEGACY_SUPPORT_TRUE@utilities_montage_SOURCES = utilities/montage.c
+@LEGACY_SUPPORT_FALSE@utilities_stream_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_TRUE@utilities_stream_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+@LEGACY_SUPPORT_FALSE@utilities_stream_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_TRUE@utilities_stream_LDFLAGS = $(LDFLAGS)
+@LEGACY_SUPPORT_FALSE@utilities_stream_SOURCES = utilities/stream.c
+@LEGACY_SUPPORT_TRUE@utilities_stream_SOURCES = utilities/stream.c
+@LEGACY_SUPPORT_FALSE@UTILITIES_MANS = \
+@LEGACY_SUPPORT_FALSE@ utilities/ImageMagick.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/animate.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/compare.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/composite.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/conjure.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/display.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/identify.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/import.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/magick.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/mogrify.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/montage.1 \
+@LEGACY_SUPPORT_FALSE@ utilities/stream.1
+
+@LEGACY_SUPPORT_TRUE@UTILITIES_MANS = \
+@LEGACY_SUPPORT_TRUE@  utilities/ImageMagick.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/animate.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/compare.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/composite.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/conjure.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/convert.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/display.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/identify.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/import.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/magick.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/mogrify.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/montage.1 \
+@LEGACY_SUPPORT_TRUE@  utilities/stream.1
+
+@LEGACY_SUPPORT_FALSE@UTILITIES_CONFIGURE = \
+@LEGACY_SUPPORT_FALSE@ utilities/ImageMagick.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/animate.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/compare.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/composite.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/conjure.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/display.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/identify.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/import.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/magick.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/mogrify.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/montage.1.in \
+@LEGACY_SUPPORT_FALSE@ utilities/stream.1.in
+
+@LEGACY_SUPPORT_TRUE@UTILITIES_CONFIGURE = \
+@LEGACY_SUPPORT_TRUE@  utilities/ImageMagick.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/animate.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/compare.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/composite.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/conjure.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/convert.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/display.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/identify.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/import.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/magick.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/mogrify.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/montage.1.in \
+@LEGACY_SUPPORT_TRUE@  utilities/stream.1.in
 
 UTILITIES_EXTRA_DIST = \
        $(UTILITIES_MANS) \
index 720a4c965801eaaf2b4b15f9943d7cbdfbe1f26a..75f75d325591d23f6850f79e1da6e24cc7bb3945 100644 (file)
@@ -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-19</created>
+    <created>2012-03-20</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-19</created>
+          <created>2012-03-20</created>
           <revision>7.0.0</revision>
       </Version>
     </release>
index 70ae1c9dd90d9c42bdfedea2ee3509c6db5c93bc..d520f0c067b77fabff67f3d963943fbf82e92695 100644 (file)
@@ -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="7174" />
-  <configure name="RELEASE_DATE" value="2012-03-19"/>
+  <configure name="SVN_REVISION" value="7178" />
+  <configure name="RELEASE_DATE" value="2012-03-20"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>
index 1c9778c83640ace04f37be7d3c69b688c4547ac8..fd6f515aac6828a3d8a93480b45df25e0ad53401 100755 (executable)
--- a/configure
+++ b/configure
@@ -866,6 +866,8 @@ MODULE_EXTRA_CPPFLAGS
 LIBSTDCLDFLAGS
 PERL_MAKE_OPTIONS
 QUANTUM_DEPTH
+LEGACY_SUPPORT_FALSE
+LEGACY_SUPPORT_TRUE
 MAINT
 MAINTAINER_MODE_FALSE
 MAINTAINER_MODE_TRUE
@@ -1125,6 +1127,7 @@ enable_prof
 enable_gprof
 enable_gcov
 with_method_prefix
+enable_legacy_support
 with_quantum_depth
 with_cache
 with_frozenpaths
@@ -1857,6 +1860,7 @@ Optional Features:
   --enable-prof           enable 'prof' profiling support
   --enable-gprof          enable 'gprof' profiling support
   --enable-gcov           enable 'gcov' profiling support
+  --enable-legacy-support  install legacy command-line utilities (default disabled)
   --disable-assert        turn off assertions
 
 Optional Packages:
@@ -3616,7 +3620,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=7174
+MAGICK_SVN_REVISION=7178
 
 
 
@@ -21871,6 +21875,23 @@ _ACEOF
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix "
 fi
 
+# Enable legacy support (default no)
+# Check whether --enable-legacy-support was given.
+if test "${enable_legacy_support+set}" = set; then :
+  enableval=$enable_legacy_support; with_legacy_support=$enableval
+else
+  with_legacy_support='no'
+fi
+
+ if test "$with_legacy_support" != 'no'; then
+  LEGACY_SUPPORT_TRUE=
+  LEGACY_SUPPORT_FALSE='#'
+else
+  LEGACY_SUPPORT_TRUE='#'
+  LEGACY_SUPPORT_FALSE=
+fi
+
+
 # Number of bits in a Quantum
 
 # Check whether --with-quantum-depth was given.
@@ -35917,6 +35938,10 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
   as_fn_error $? "conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${LEGACY_SUPPORT_TRUE}" && test -z "${LEGACY_SUPPORT_FALSE}"; then
+  as_fn_error $? "conditional \"LEGACY_SUPPORT\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
index 9e56c9a87a658b8e99759ada703d41e5ef531d95..f374d87d0f4881c7802174acbb34801644b42eea 100755 (executable)
@@ -689,6 +689,13 @@ if test "$with_method_prefix" != 'no'; then
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix "
 fi
 
+# Enable legacy support (default no)
+AC_ARG_ENABLE(legacy-support,
+              [  --enable-legacy-support  install legacy command-line utilities (default disabled)],
+              [with_legacy_support=$enableval],
+              [with_legacy_support='no'])
+AM_CONDITIONAL(LEGACY_SUPPORT, test "$with_legacy_support" != 'no')
+
 # Number of bits in a Quantum
 AC_ARG_WITH([quantum-depth],
     [AC_HELP_STRING([--with-quantum-depth=DEPTH],
index 25bd1989316e52ce58b91fa1c2f9641cd4290d93..4f1e728134413e5d196d34f7552ebb6396f09485 100644 (file)
@@ -14,6 +14,7 @@
 #
 #  Makefile for building ImageMagick utilities.
 
+if LEGACY_SUPPORT
 UTILITIES_PGMS = \
        utilities/animate \
        utilities/compare \
@@ -27,11 +28,27 @@ UTILITIES_PGMS = \
        utilities/mogrify \
        utilities/montage \
        utilities/stream
+else
+UTILITIES_PGMS = \
+       utilities/animate \
+       utilities/compare \
+       utilities/composite \
+       utilities/conjure \
+       utilities/convert \
+       utilities/display \
+       utilities/identify \
+       utilities/import \
+       utilities/magick \
+       utilities/mogrify \
+       utilities/montage \
+       utilities/stream
+endif
 
 UTILITIES_XFAIL_TESTS = \
   $(UTILITIES_TTF_XFAIL_TESTS) \
   $(UTILITIES_XML_XFAIL_TESTS)
 
+if LEGACY_SUPPORT
 utilities_animate_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_animate_LDFLAGS      = $(LDFLAGS)
 utilities_animate_SOURCES      = utilities/animate.c
@@ -79,7 +96,53 @@ utilities_montage_SOURCES    = utilities/montage.c
 utilities_stream_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
 utilities_stream_LDFLAGS       = $(LDFLAGS)
 utilities_stream_SOURCES       = utilities/stream.c
+else
+utilities_animate_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_animate_LDFLAGS      = $(LDFLAGS)
+utilities_animate_SOURCES      = utilities/animate.c
+
+utilities_compare_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_compare_LDFLAGS      = $(LDFLAGS)
+utilities_compare_SOURCES      = utilities/compare.c
+
+utilities_composite_LDADD      = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_composite_LDFLAGS    = $(LDFLAGS)
+utilities_composite_SOURCES    = utilities/composite.c
+
+utilities_conjure_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_conjure_LDFLAGS      = $(LDFLAGS)
+utilities_conjure_SOURCES      = utilities/conjure.c
+
+utilities_display_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_display_LDFLAGS      = $(LDFLAGS)
+utilities_display_SOURCES      = utilities/display.c
+
+utilities_identify_LDADD       = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_identify_LDFLAGS     = $(LDFLAGS)
+utilities_identify_SOURCES     = utilities/identify.c
+
+utilities_import_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_import_LDFLAGS       = $(LDFLAGS)
+utilities_import_SOURCES       = utilities/import.c
+
+utilities_magick_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_magick_LDFLAGS       = $(LDFLAGS)
+utilities_magick_SOURCES       = utilities/magick.c
+
+utilities_mogrify_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_mogrify_LDFLAGS      = $(LDFLAGS)
+utilities_mogrify_SOURCES      = utilities/mogrify.c
+
+utilities_montage_LDADD        = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_montage_LDFLAGS      = $(LDFLAGS)
+utilities_montage_SOURCES      = utilities/montage.c
+
+utilities_stream_LDADD = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
+utilities_stream_LDFLAGS       = $(LDFLAGS)
+utilities_stream_SOURCES       = utilities/stream.c
+endif
 
+if LEGACY_SUPPORT
 UTILITIES_MANS = \
        utilities/ImageMagick.1 \
        utilities/animate.1 \
@@ -90,10 +153,27 @@ UTILITIES_MANS = \
        utilities/display.1 \
        utilities/identify.1 \
        utilities/import.1 \
+       utilities/magick.1 \
+       utilities/mogrify.1 \
+       utilities/montage.1 \
+       utilities/stream.1
+else
+UTILITIES_MANS = \
+       utilities/ImageMagick.1 \
+       utilities/animate.1 \
+       utilities/compare.1 \
+       utilities/composite.1 \
+       utilities/conjure.1 \
+       utilities/display.1 \
+       utilities/identify.1 \
+       utilities/import.1 \
+       utilities/magick.1 \
        utilities/mogrify.1 \
        utilities/montage.1 \
        utilities/stream.1
+endif
 
+if LEGACY_SUPPORT
 UTILITIES_CONFIGURE = \
        utilities/ImageMagick.1.in \
        utilities/animate.1.in \
@@ -104,9 +184,25 @@ UTILITIES_CONFIGURE = \
        utilities/display.1.in \
        utilities/identify.1.in \
        utilities/import.1.in \
+       utilities/magick.1.in \
+       utilities/mogrify.1.in \
+       utilities/montage.1.in \
+       utilities/stream.1.in
+else
+UTILITIES_CONFIGURE = \
+       utilities/ImageMagick.1.in \
+       utilities/animate.1.in \
+       utilities/compare.1.in \
+       utilities/composite.1.in \
+       utilities/conjure.1.in \
+       utilities/display.1.in \
+       utilities/identify.1.in \
+       utilities/import.1.in \
+       utilities/magick.1.in \
        utilities/mogrify.1.in \
        utilities/montage.1.in \
        utilities/stream.1.in
+endif
 
 UTILITIES_EXTRA_DIST = \
        $(UTILITIES_MANS) \
diff --git a/utilities/magick.1 b/utilities/magick.1
new file mode 100644 (file)
index 0000000..efc2541
--- /dev/null
@@ -0,0 +1,280 @@
+.TH convert 1 "Date: 2009/01/10 01:00:00" "ImageMagick"
+.SH NAME
+convert \- convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.
+.SH SYNOPSIS
+.TP
+\fBconvert\fP [\fIinput-options\fP] \fIinput-file\fP [\fIoutput-options\fP] \fIoutput-file\fP
+.SH OVERVIEW
+The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.  
+
+For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick//www/convert.html or http://www.imagemagick.org/script/convert.php.
+.SH DESCRIPTION
+Image Settings:
+  \-adjoin              join images into a single multi-image file
+  \-affine matrix       affine transform matrix
+  \-antialias           remove pixel-aliasing
+  \-authenticate value  decrypt image with this password
+  \-background color    background color
+  \-bias value          add bias when convolving an image
+  \-black-point-compensation
+                       use black point compensation
+  \-blue-primary point  chromaticity blue primary point
+  \-bordercolor color   border color
+  \-caption string      assign a caption to an image
+  \-cdl filename        color correct with a color decision list
+  \-channel type        apply option to select image channels
+  \-colors value        preferred number of colors in the image
+  \-colorspace type     alternate image colorspace
+  \-comment string      annotate image with comment
+  \-compose operator    set image composite operator
+  \-compress type       type of pixel compression when writing the image
+  \-decipher filename   convert cipher pixels to plain pixels
+  \-define format:option
+                       define one or more image format options
+  \-delay value         display the next image after pausing
+  \-density geometry    horizontal and vertical density of the image
+  \-depth value         image depth
+  \-direction type      render text right-to-left or left-to-right
+  \-display server      get image or font from this X server
+  \-dispose method      layer disposal method
+  \-dither method       apply error diffusion to image
+  \-encipher filename   convert plain pixels to cipher pixels
+  \-encoding type       text encoding type
+  \-endian type         endianness (MSB or LSB) of the image
+  \-family name         render text with this font family
+  \-fill color          color to use when filling a graphic primitive
+  \-filter type         use this filter when resizing an image
+  \-flatten             flatten a sequence of images
+  \-font name           render text with this font
+  \-format "string"     output formatted image characteristics
+  \-fuzz distance       colors within this distance are considered equal
+  \-gravity type        horizontal and vertical text placement
+  \-green-primary point chromaticity green primary point
+  \-intent type         type of rendering intent when managing the image color
+  \-interlace type      type of image interlacing scheme
+  \-interpolate method  pixel color interpolation method
+  \-kerning value       set the space between two letters
+  \-label string        assign a label to an image
+  \-limit type value    pixel cache resource limit
+  \-loop iterations     add Netscape loop extension to your GIF animation
+  \-mask filename       associate a mask with the image
+  \-matte               store matte channel if the image has one
+  \-mattecolor color    frame color
+  \-monitor             monitor progress
+  \-orient type         image orientation
+  \-origin geometry     image origin
+  \-page geometry       size and location of an image canvas (setting)
+  \-ping                efficiently determine image attributes
+  \-pointsize value     font point size
+  \-preview type        image preview type
+  \-quality value       JPEG/MIFF/PNG compression level
+  \-quiet               suppress all warning messages
+  \-red-primary point   chromaticity red primary point
+  \-regard-warnings     pay attention to warning messages
+  \-sampling-factor geometry
+                       horizontal and vertical sampling factor
+  \-scene value         image scene number
+  \-seed value          seed a new sequence of pseudo-random numbers
+  \-size geometry       width and height of image
+  \-statistic type geometry
+                       replace each pixel with corresponding statistic from the neighborhood
+  \-stretch type        render text with this font stretch
+  \-stroke color        graphic primitive stroke color
+  \-strokewidth value   graphic primitive stroke width
+  \-style type          render text with this font style
+  \-support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
+  \-synchronize         synchronize image to storage device
+  \-taint               declare the image as modified
+  \-texture filename    name of texture to tile onto the image background
+  \-tile-offset geometry
+                       tile offset
+  \-treedepth value     color tree depth
+  \-transparent-color color
+                       transparent color
+  \-undercolor color    annotation bounding box color
+  \-units type          the units of image resolution
+  \-verbose             print detailed information about the image
+  \-view                FlashPix viewing transforms
+  \-virtual-pixel method
+                       virtual pixel access method
+  \-weight type         render text with this font weight
+  \-white-point point   chromaticity white point
+
+Image Operators:
+  \-adaptive-blur geometry
+                       adaptively blur pixels; decrease effect near edges
+  \-adaptive-resize geometry
+                       adaptively resize image with data dependent triangulation
+  \-adaptive-sharpen geometry
+                       adaptively sharpen pixels; increase effect near edges
+  \-annotate geometry text
+                       annotate the image with text
+  \-auto-orient         automatically orient image
+  \-black-threshold value
+                       force all pixels below the threshold into black
+  \-blur geometry       reduce image noise and reduce detail levels
+  \-border geometry     surround image with a border of color
+  \-charcoal radius     simulate a charcoal drawing
+  \-chop geometry       remove pixels from the image interior
+  \-clip                clip along the first path from the 8BIM profile
+  \-clip-mask filename  associate a clip mask with the image
+  \-clip-path id        clip along a named path from the 8BIM profile
+  \-colorize value      colorize the image with the fill color
+  \-color-matrix matrix apply color correction to the image
+  \-contrast            enhance or reduce the image contrast
+  \-contrast-stretch geometry
+                       improve contrast by `stretching' the intensity range
+  \-convolve coefficients
+                       apply a convolution kernel to the image
+  \-cycle amount        cycle the image colormap
+  \-despeckle           reduce the speckles within an image
+  \-draw string         annotate the image with a graphic primitive
+  \-edge radius         apply a filter to detect edges in the image
+  \-emboss radius       emboss an image
+  \-enhance             apply a digital filter to enhance a noisy image
+  \-equalize            perform histogram equalization to an image
+  \-evaluate operator value
+                       evaluate an arithmetic, relational, or logical expression
+  \-extent geometry     set the image size
+  \-extract geometry    extract area from image
+  \-fft                 implements the discrete Fourier transform (DFT)
+  \-flip                flip image vertically
+  \-floodfill geometry color
+                       floodfill the image with color
+  \-flop                flop image horizontally
+  \-frame geometry      surround image with an ornamental border
+  \-function name       apply a function to the image
+  \-gamma value         level of gamma correction
+  \-gaussian-blur geometry
+                       reduce image noise and reduce detail levels
+  \-geometry geometry   preferred size or location of the image
+  \-identify            identify the format and characteristics of the image
+  \-ift                 implements the inverse discrete Fourier transform (DFT)
+  \-implode amount      implode image pixels about the center
+  \-lat geometry        local adaptive thresholding
+  \-layers method       optimize or compare image layers
+  \-level value         adjust the level of image contrast
+  \-linear-stretch geometry
+                       improve contrast by `stretching with saturation' the intensity range
+  \-median geometry     apply a median filter to the image
+  \-mode geometry       make each pixel the 'predominant color' of the neighborhood
+  \-modulate value      vary the brightness, saturation, and hue
+  \-monochrome          transform image to black and white
+  \-morphology method kernel
+                       apply a morphology method to the image
+  \-motion-blur geometry
+                       simulate motion blur
+  \-negate              replace each pixel with its complementary color 
+  \-noise geometry      add or reduce noise in an image
+  \-normalize           transform image to span the full range of colors
+  \-opaque color        change this color to the fill color
+  \-ordered-dither NxN
+                       add a noise pattern to the image with specific amplitudes
+  \-paint radius        simulate an oil painting
+  \-polaroid angle      simulate a Polaroid picture
+  \-posterize levels    reduce the image to a limited number of color levels
+  \-print string        interpret string and print to console
+  \-profile filename    add, delete, or apply an image profile
+  \-quantize colorspace reduce colors in this colorspace
+  \-radial-blur angle   radial blur the image
+  \-raise value         lighten/darken image edges to create a 3-D effect
+  \-random-threshold low,high
+                       random threshold the image
+  \-region geometry     apply options to a portion of the image
+  \-render              render vector graphics
+  \-repage geometry     size and location of an image canvas
+  \-resample geometry   change the resolution of an image
+  \-resize geometry     resize the image
+  \-roll geometry       roll an image vertically or horizontally
+  \-rotate degrees      apply Paeth rotation to the image
+  \-sample geometry     scale image with pixel sampling
+  \-scale geometry      scale the image
+  \-segment values      segment an image
+  \-selective-blur geometry
+                       selectively blur pixels within a contrast threshold
+  \-sepia-tone threshold
+                       simulate a sepia-toned photo
+  \-set property value  set an image property
+  \-shade degrees       shade the image using a distant light source
+  \-shadow geometry     simulate an image shadow
+  \-sharpen geometry    sharpen the image
+  \-shave geometry      shave pixels from the image edges
+  \-shear geometry      slide one edge of the image along the X or Y axis
+  \-sigmoidal-contrast geometry
+                       lightness rescaling using sigmoidal contrast enhancement
+  \-sketch geometry     simulate a pencil sketch
+  \-solarize threshold  negate all pixels above the threshold level
+  \-splice geometry     splice the background color into the image
+  \-spread amount       displace image pixels by a random amount
+  \-strip               strip image of all profiles and comments
+  \-swirl degrees       swirl image pixels about the center
+  \-threshold value     threshold the image
+  \-thumbnail geometry  create a thumbnail of the image
+  \-tile filename       tile image when filling a graphic primitive
+  \-tint value          tint the image with the fill color
+  \-transform           affine transform image
+  \-transparent color   make this color transparent within the image
+  \-transpose           flip image vertically and rotate 90 degrees
+  \-transverse          flop image horizontally and rotate 270 degrees
+  \-trim                trim image edges
+  \-type type           image type
+  \-unique-colors       discard all but one of any pixel color
+  \-unsharp geometry    sharpen the image
+  \-vignette geometry   soften the edges of the image in vignette style
+  \-wave geometry       alter an image along a sine wave
+  \-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)
+  \-clut                apply a color lookup table to the image
+  \-coalesce            merge a sequence of images
+  \-combine             combine a sequence of images
+  \-composite           composite image
+  \-crop geometry       cut out a rectangular region of the image
+  \-deconstruct         break down an image sequence into constituent parts
+  \-evaluate-sequence operator
+                       evaluate an arithmetic, relational, or logical expression
+  \-flatten             flatten a sequence of images
+  \-fx expression       apply mathematical expression to an image channel(s)
+  \-hald-clut           apply a Hald color lookup table to the image
+  \-morph value         morph an image sequence
+  \-mosaic              create a mosaic from an image sequence
+  \-process arguments   process the image with a custom image filter
+  \-separate            separate an image channel into a grayscale image
+  \-smush geometry      smush an image sequence together
+  \-write filename      write images to this file
+
+Image Stack Operators:
+  \-clone indexes       clone an image
+  \-delete indexes      delete the image from the image sequence
+  \-duplicate count,indexes
+                       duplicate an image one or more times
+  \-insert index        insert last image into the image sequence
+  \-swap indexes        swap two images in the image sequence
+
+Miscellaneous Options:
+  \-debug events        display copious debugging information
+  \-help                print program options
+  \-log format          format of debugging information
+  \-list type           print a list of supported option arguments
+  \-version             print version information
+
+Use any setting or operator as an \fIoutput-option\fP.  Only a limited number of setting are  \fIinput-option\fP. They include: \-antialias, \-caption, \-density, \-define, \-encoding, \-font, \-pointsize, \-size, and \-texture as well as any of the miscellaneous options.
+
+By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
+.SH SEE ALSO
+ImageMagick(1)
+
+.SH COPYRIGHT
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/utilities/magick.1.in b/utilities/magick.1.in
new file mode 100644 (file)
index 0000000..38d9b59
--- /dev/null
@@ -0,0 +1,280 @@
+.TH magick 1 "Date: 2009/01/10 01:00:00" "ImageMagick"
+.SH NAME
+magick \- convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.
+.SH SYNOPSIS
+.TP
+\fBmagick\fP [\fIinput-options\fP] \fIinput-file\fP [\fIoutput-options\fP] \fIoutput-file\fP
+.SH OVERVIEW
+The \fBmagick\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.  
+
+For more information about the magick command, point your browser to file://@DOCUMENTATION_PATH@/www/convert.html or http://www.imagemagick.org/script/convert.php.
+.SH DESCRIPTION
+Image Settings:
+  \-adjoin              join images into a single multi-image file
+  \-affine matrix       affine transform matrix
+  \-antialias           remove pixel-aliasing
+  \-authenticate value  decrypt image with this password
+  \-background color    background color
+  \-bias value          add bias when convolving an image
+  \-black-point-compensation
+                       use black point compensation
+  \-blue-primary point  chromaticity blue primary point
+  \-bordercolor color   border color
+  \-caption string      assign a caption to an image
+  \-cdl filename        color correct with a color decision list
+  \-channel type        apply option to select image channels
+  \-colors value        preferred number of colors in the image
+  \-colorspace type     alternate image colorspace
+  \-comment string      annotate image with comment
+  \-compose operator    set image composite operator
+  \-compress type       type of pixel compression when writing the image
+  \-decipher filename   magick cipher pixels to plain pixels
+  \-define format:option
+                       define one or more image format options
+  \-delay value         display the next image after pausing
+  \-density geometry    horizontal and vertical density of the image
+  \-depth value         image depth
+  \-direction type      render text right-to-left or left-to-right
+  \-display server      get image or font from this X server
+  \-dispose method      layer disposal method
+  \-dither method       apply error diffusion to image
+  \-encipher filename   magick plain pixels to cipher pixels
+  \-encoding type       text encoding type
+  \-endian type         endianness (MSB or LSB) of the image
+  \-family name         render text with this font family
+  \-fill color          color to use when filling a graphic primitive
+  \-filter type         use this filter when resizing an image
+  \-flatten             flatten a sequence of images
+  \-font name           render text with this font
+  \-format "string"     output formatted image characteristics
+  \-fuzz distance       colors within this distance are considered equal
+  \-gravity type        horizontal and vertical text placement
+  \-green-primary point chromaticity green primary point
+  \-intent type         type of rendering intent when managing the image color
+  \-interlace type      type of image interlacing scheme
+  \-interpolate method  pixel color interpolation method
+  \-kerning value       set the space between two letters
+  \-label string        assign a label to an image
+  \-limit type value    pixel cache resource limit
+  \-loop iterations     add Netscape loop extension to your GIF animation
+  \-mask filename       associate a mask with the image
+  \-matte               store matte channel if the image has one
+  \-mattecolor color    frame color
+  \-monitor             monitor progress
+  \-orient type         image orientation
+  \-origin geometry     image origin
+  \-page geometry       size and location of an image canvas (setting)
+  \-ping                efficiently determine image attributes
+  \-pointsize value     font point size
+  \-preview type        image preview type
+  \-quality value       JPEG/MIFF/PNG compression level
+  \-quiet               suppress all warning messages
+  \-red-primary point   chromaticity red primary point
+  \-regard-warnings     pay attention to warning messages
+  \-sampling-factor geometry
+                       horizontal and vertical sampling factor
+  \-scene value         image scene number
+  \-seed value          seed a new sequence of pseudo-random numbers
+  \-size geometry       width and height of image
+  \-statistic type geometry
+                       replace each pixel with corresponding statistic from the neighborhood
+  \-stretch type        render text with this font stretch
+  \-stroke color        graphic primitive stroke color
+  \-strokewidth value   graphic primitive stroke width
+  \-style type          render text with this font style
+  \-support factor      resize support: > 1.0 is blurry, < 1.0 is sharp
+  \-synchronize         synchronize image to storage device
+  \-taint               declare the image as modified
+  \-texture filename    name of texture to tile onto the image background
+  \-tile-offset geometry
+                       tile offset
+  \-treedepth value     color tree depth
+  \-transparent-color color
+                       transparent color
+  \-undercolor color    annotation bounding box color
+  \-units type          the units of image resolution
+  \-verbose             print detailed information about the image
+  \-view                FlashPix viewing transforms
+  \-virtual-pixel method
+                       virtual pixel access method
+  \-weight type         render text with this font weight
+  \-white-point point   chromaticity white point
+
+Image Operators:
+  \-adaptive-blur geometry
+                       adaptively blur pixels; decrease effect near edges
+  \-adaptive-resize geometry
+                       adaptively resize image with data dependent triangulation
+  \-adaptive-sharpen geometry
+                       adaptively sharpen pixels; increase effect near edges
+  \-annotate geometry text
+                       annotate the image with text
+  \-auto-orient         automatically orient image
+  \-black-threshold value
+                       force all pixels below the threshold into black
+  \-blur geometry       reduce image noise and reduce detail levels
+  \-border geometry     surround image with a border of color
+  \-charcoal radius     simulate a charcoal drawing
+  \-chop geometry       remove pixels from the image interior
+  \-clip                clip along the first path from the 8BIM profile
+  \-clip-mask filename  associate a clip mask with the image
+  \-clip-path id        clip along a named path from the 8BIM profile
+  \-colorize value      colorize the image with the fill color
+  \-color-matrix matrix apply color correction to the image
+  \-contrast            enhance or reduce the image contrast
+  \-contrast-stretch geometry
+                       improve contrast by `stretching' the intensity range
+  \-convolve coefficients
+                       apply a convolution kernel to the image
+  \-cycle amount        cycle the image colormap
+  \-despeckle           reduce the speckles within an image
+  \-draw string         annotate the image with a graphic primitive
+  \-edge radius         apply a filter to detect edges in the image
+  \-emboss radius       emboss an image
+  \-enhance             apply a digital filter to enhance a noisy image
+  \-equalize            perform histogram equalization to an image
+  \-evaluate operator value
+                       evaluate an arithmetic, relational, or logical expression
+  \-extent geometry     set the image size
+  \-extract geometry    extract area from image
+  \-fft                 implements the discrete Fourier transform (DFT)
+  \-flip                flip image vertically
+  \-floodfill geometry color
+                       floodfill the image with color
+  \-flop                flop image horizontally
+  \-frame geometry      surround image with an ornamental border
+  \-function name       apply a function to the image
+  \-gamma value         level of gamma correction
+  \-gaussian-blur geometry
+                       reduce image noise and reduce detail levels
+  \-geometry geometry   preferred size or location of the image
+  \-identify            identify the format and characteristics of the image
+  \-ift                 implements the inverse discrete Fourier transform (DFT)
+  \-implode amount      implode image pixels about the center
+  \-lat geometry        local adaptive thresholding
+  \-layers method       optimize or compare image layers
+  \-level value         adjust the level of image contrast
+  \-linear-stretch geometry
+                       improve contrast by `stretching with saturation' the intensity range
+  \-median geometry     apply a median filter to the image
+  \-mode geometry       make each pixel the 'predominant color' of the neighborhood
+  \-modulate value      vary the brightness, saturation, and hue
+  \-monochrome          transform image to black and white
+  \-morphology method kernel
+                       apply a morphology method to the image
+  \-motion-blur geometry
+                       simulate motion blur
+  \-negate              replace each pixel with its complementary color 
+  \-noise geometry      add or reduce noise in an image
+  \-normalize           transform image to span the full range of colors
+  \-opaque color        change this color to the fill color
+  \-ordered-dither NxN
+                       add a noise pattern to the image with specific amplitudes
+  \-paint radius        simulate an oil painting
+  \-polaroid angle      simulate a Polaroid picture
+  \-posterize levels    reduce the image to a limited number of color levels
+  \-print string        interpret string and print to console
+  \-profile filename    add, delete, or apply an image profile
+  \-quantize colorspace reduce colors in this colorspace
+  \-radial-blur angle   radial blur the image
+  \-raise value         lighten/darken image edges to create a 3-D effect
+  \-random-threshold low,high
+                       random threshold the image
+  \-region geometry     apply options to a portion of the image
+  \-render              render vector graphics
+  \-repage geometry     size and location of an image canvas
+  \-resample geometry   change the resolution of an image
+  \-resize geometry     resize the image
+  \-roll geometry       roll an image vertically or horizontally
+  \-rotate degrees      apply Paeth rotation to the image
+  \-sample geometry     scale image with pixel sampling
+  \-scale geometry      scale the image
+  \-segment values      segment an image
+  \-selective-blur geometry
+                       selectively blur pixels within a contrast threshold
+  \-sepia-tone threshold
+                       simulate a sepia-toned photo
+  \-set property value  set an image property
+  \-shade degrees       shade the image using a distant light source
+  \-shadow geometry     simulate an image shadow
+  \-sharpen geometry    sharpen the image
+  \-shave geometry      shave pixels from the image edges
+  \-shear geometry      slide one edge of the image along the X or Y axis
+  \-sigmoidal-contrast geometry
+                       lightness rescaling using sigmoidal contrast enhancement
+  \-sketch geometry     simulate a pencil sketch
+  \-solarize threshold  negate all pixels above the threshold level
+  \-splice geometry     splice the background color into the image
+  \-spread amount       displace image pixels by a random amount
+  \-strip               strip image of all profiles and comments
+  \-swirl degrees       swirl image pixels about the center
+  \-threshold value     threshold the image
+  \-thumbnail geometry  create a thumbnail of the image
+  \-tile filename       tile image when filling a graphic primitive
+  \-tint value          tint the image with the fill color
+  \-transform           affine transform image
+  \-transparent color   make this color transparent within the image
+  \-transpose           flip image vertically and rotate 90 degrees
+  \-transverse          flop image horizontally and rotate 270 degrees
+  \-trim                trim image edges
+  \-type type           image type
+  \-unique-colors       discard all but one of any pixel color
+  \-unsharp geometry    sharpen the image
+  \-vignette geometry   soften the edges of the image in vignette style
+  \-wave geometry       alter an image along a sine wave
+  \-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)
+  \-clut                apply a color lookup table to the image
+  \-coalesce            merge a sequence of images
+  \-combine             combine a sequence of images
+  \-composite           composite image
+  \-crop geometry       cut out a rectangular region of the image
+  \-deconstruct         break down an image sequence into constituent parts
+  \-evaluate-sequence operator
+                       evaluate an arithmetic, relational, or logical expression
+  \-flatten             flatten a sequence of images
+  \-fx expression       apply mathematical expression to an image channel(s)
+  \-hald-clut           apply a Hald color lookup table to the image
+  \-morph value         morph an image sequence
+  \-mosaic              create a mosaic from an image sequence
+  \-process arguments   process the image with a custom image filter
+  \-separate            separate an image channel into a grayscale image
+  \-smush geometry      smush an image sequence together
+  \-write filename      write images to this file
+
+Image Stack Operators:
+  \-clone indexes       clone an image
+  \-delete indexes      delete the image from the image sequence
+  \-duplicate count,indexes
+                       duplicate an image one or more times
+  \-insert index        insert last image into the image sequence
+  \-swap indexes        swap two images in the image sequence
+
+Miscellaneous Options:
+  \-debug events        display copious debugging information
+  \-help                print program options
+  \-log format          format of debugging information
+  \-list type           print a list of supported option arguments
+  \-version             print version information
+
+Use any setting or operator as an \fIoutput-option\fP.  Only a limited number of setting are  \fIinput-option\fP. They include: \-antialias, \-caption, \-density, \-define, \-encoding, \-font, \-pointsize, \-size, and \-texture as well as any of the miscellaneous options.
+
+By default, the image format of `file' is determined by its magic number.  To specify a particular image format, precede the filename with an image format name and a colon (i.e. ps:image) or specify the image type as the filename suffix (i.e. image.ps).  Specify 'file' as '-' for standard input or output.
+.SH SEE ALSO
+ImageMagick(1)
+
+.SH COPYRIGHT
+\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file://@DOCUMENTATION_PATH@/www/license.html or http://www.imagemagick.org/script/license.php\fP
diff --git a/www/magick.html b/www/magick.html
new file mode 100644 (file)
index 0000000..57b7ec8
--- /dev/null
@@ -0,0 +1,1423 @@
+\r
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" \r
+  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">\r
+<html version="-//W3C//DTD XHTML 1.1//EN"\r
+      xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"\r
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+      xsi:schemaLocation="http://www.w3.org/1999/xhtml\r
+                          http://www.w3.org/MarkUp/SCHEMA/xhtml11.xsd">\r
+<head>\r
+  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>\r
+  <meta name="google-site-verification" content="MxsMq6bdLOx0KSuz1MY6yG9ZTIJ7_7DVRfl5NCAT5Yg"/>\r
+  <title>ImageMagick: Command-line Tools: Convert</title>
+  <meta http-equiv="Content-Language" content="en-US"/>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+  <meta http-equiv="Reply-to" content="magick-users@imagemagick.org"/>
+  <meta name="Application-name" content="ImageMagick"/>
+  <meta name="Description" content="Use ImageMagick to magick, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images automagically."/>
+  <meta name="Application-url" content="http://www.imagemagick.org"/>
+  <meta name="Generator" content="PHP"/>
+  <meta name="Keywords" content="command-line, tools:, magick, ImageMagick, PerlMagick, image processing, OpenMP, software development library, image, photo, software, Magick++, MagickWand"/>
+  <meta name="Rating" content="GENERAL"/>
+  <meta name="Robots" content="INDEX, FOLLOW"/>
+  <meta name="Generator" content="ImageMagick Studio LLC"/>
+  <meta name="Author" content="ImageMagick Studio LLC"/>
+  <meta name="Revisit-after" content="2 DAYS"/>
+  <meta name="Resource-type" content="document"/>
+  <meta name="Copyright" content="Copyright (c) 1999-2012 ImageMagick Studio LLC"/>
+  <meta name="Distribution" content="Global"/>
+  <link rel="icon" href="../images/wand.png"/>
+  <link rel="shortcut icon" href="../images/wand.ico"  type="images/x-icon"/>
+  <link rel="canonical" href="http://www.imagemagick.org" />\r
+  <link rel="meta" type="application/rdf+xml" title="ICI" href="http://imagemagick.org/ici.rdf"/>\r
+  <!-- Add jQuery library -->\r
+  <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.7/jquery.min.js"></script>\r
+  \r
+  <!-- Optionaly include easing and/or mousewheel plugins -->\r
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.easing-1.3.pack.js"></script>\r
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.mousewheel-3.0.6.pack.js"></script>\r
+  \r
+  <!-- Add fancyBox -->\r
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/jquery.fancybox.css?v=2.0.3" type="text/css" media="screen" />\r
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/jquery.fancybox.pack.js?v=2.0.3"></script>\r
+  \r
+  <!-- Optionaly include button and/or thumbnail helpers -->\r
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.css?v=2.0.3" type="text/css" media="screen" />\r
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-buttons.js?v=2.0.3"></script>\r
+  \r
+  <link rel="stylesheet" href="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.css?v=2.0.3" type="text/css" media="screen" />\r
+  <script type="text/javascript" src="http://www.imagemagick.org/fancybox/helpers/jquery.fancybox-thumbs.js?v=2.0.3"></script>\r
+  <script type="text/javascript">\r
+       $(document).ready(function() {\r
+               $(".fancybox").fancybox();\r
+       });\r
+  </script>\r
+  <!-- ImageMagick style -->\r
+  <link rel="stylesheet" href="http://www.google.com/cse/style/look/default.css" type="text/css" />\r
+  <style type="text/css" media="all">\r
+    @import url("../www/magick.css");\r
+  </style>\r
+</head>\r
+\r
+<body id="www-imagemagick-org">\r
+<div class="titlebar">\r
+<div style="margin: 17px auto; float: left;">\r
+  <script type="text/javascript">\r
+  <!--\r
+    google_ad_client = "pub-3129977114552745";\r
+    google_ad_slot = "5439289906";\r
+    google_ad_width = 728;\r
+    google_ad_height = 90;\r
+  //-->\r
+  </script>\r
+  <script type="text/javascript"\r
+    src="http://pagead2.googlesyndication.com/pagead/show_ads.js">\r
+  </script>\r
+</div>\r
+<a href="http://www.imagemagick.org/discourse-server/">\r
+  <img src="../images/logo.jpg"\r
+  alt="ImageMagick Logo"\r
+  style="width: 123px; height: 118px; border: 0px; float: right;" /></a>\r
+<a href="../index.html">\r
+  <img src="../images/sprite.jpg"\r
+  alt="ImageMagick Sprite"\r
+  style="width: 114px; height: 118px; border: 0px; float: right;" /></a>\r
+</div>\r
+\r
+<div class="westbar">\r
+\r
+<div class="menu">
+  <a title="About ImageMagick" href="../index.html">About ImageMagick</a>
+</div>
+<div class="menu">
+  <a title="Binary Releases" href="../www/binary-releases.html">Binary Releases</a>
+</div>
+<div class="sub">
+    <a title="Binary Release: Unix" href="../www/binary-releases.html#unix">Unix</a>
+</div>
+<div class="sub">
+    <a title="Binary Release: MacOS X" href="../www/binary-releases.html#macosx">Mac OS X</a>
+</div>
+<div class="sub">
+    <a title="Binary Release: iOS" href="../www/binary-releases.html#iOS">iOS</a>
+</div>
+<div class="sub">
+    <a title="Binary Release: Windows" href="../www/binary-releases.html#windows">Windows</a>
+</div>
+<div class="sep"></div>\r
+<div class="menu">
+  <a title="Command-line Tools" href="../www/command-line-tools.html">Command-line Tools</a>
+</div>
+<div class="sub">
+    <a title="Command-line Tools: Processing" href="../www/command-line-processing.html">Processing</a>
+</div>
+<div class="sub">
+    <a title="Command-line Tools: Options" href="../www/command-line-options.html">Options</a>
+</div>
+<div class="sub">
+    <a title="Command-line Tools: Usage" href="http://www.imagemagick.org/Usage/">Usage</a>
+</div>
+<div class="menu">
+  <a title="Program Interfaces" href="../www/api.html">Program Interfaces</a>
+</div>
+<div class="sub">
+    <a title="Program Interface: MagickWand" href="../www/magick-wand.html">MagickWand</a>
+</div>
+<div class="sub">
+    <a title="Program Interface: MagickCore" href="../www/magick-core.html">MagickCore</a>
+</div>
+<div class="sub">
+    <a title="Program Interface: PerlMagick" href="../www/perl-magick.html">PerlMagick</a>
+</div>
+<div class="sub">
+    <a title="Program Interface: Magick++" href="../www/magick++.html">Magick++</a>
+</div>
+<div class="sep"></div>\r
+<div  class="menu">
+   <a title="Install from Source" href="../www/install-source.html">Install from Source</a>
+</div>
+<div class="sub">
+    <a title="Install from Source: Unix" href="../www/install-source.html#unix">Unix</a>
+</div>
+<div class="sub">
+    <a title="Install from Source: Windows" href="../www/install-source.html#windows">Windows</a>
+ </div>
+<div class="menu">
+  <a title="Resources" href="../www/resources.html">Resources</a>
+</div>
+<div class="menu">
+  <a title="Architecture" href="../www/architecture.html">Architecture</a>
+</div>
+<div class="menu">
+  <a title="Download" href="../www/download.html">Download</a>
+</div>
+<div class="sep"></div>\r
+<div class="menu">
+  <a title="Search" href="../www/search.html">Search</a>
+</div>
+<div class="sep"></div>\r
+<div class="menu">
+  <a title="Site Map" href="../www/sitemap.html">Site Map</a>
+</div>
+<div  class="sub">
+  <a title="Site Map: Links" href="../www/links.html">Links</a>
+</div>
+<div class="sep"></div>\r
+<div class="menu">
+  <a rel="follow" title="Sponsors" href="../www/sponsors.html">Sponsors:</a>
+
+  <a href="http://www.networkredux.com"> <img src="../images/networkredux.png" width="140" height="31" alt="[sponsor]" style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" /></a>
+  <a href="http://www.dinodirect.com/ipads-tablets/"> <img src="../images/dino-direct.jpg" width="140" height="90" alt="[sponsor]" style="margin-top: 4px; margin-left: 4px; border: 0px; float: left;" /></a><!-- 201204010120 mickey@163... -->
+<div class="sponsbox">
+<div class="sponsor">
+  <a rel="follow" title="Android Tablet" href="http://www.dinodirect.com/ipads-tablets/">Android Tablet</a><!-- 201204010120 mickey@163... -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: Web Hosting" href="http://www.micfo.com">Web Hosting</a><!-- 209901010090s golestan -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: Autos Part" href="http://www.pkwteile.de/autoteile">Autos Part</a><!-- 201203010270 info@pkwte... -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: Web Site Hosting" href="http://webhostinggeeks.com">Web Site Hosting</a><!-- 201302010900 funds@enmob... -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: Tenant Check" href="http://www.rentmethod.com/">Tenant Check</a><!-- 201203010090 chris@rentm... -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: VPS" href="http://www.interdominios.com/vps">VPS</a><!-- 201204010090 barsh@inter... -->
+</div>
+<div class="sponsor">
+   <a rel="follow" title="Sponsor: Premium Quality Stock Photos" href="http://www.f1online.pro/en/">Premium Quality Stock Photos</a><!-- 2012080100540 ... -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: Search engine optimisation" href="http://www.seomoves.com.au">Search engine optimisation</a><!-- 201301010090s jen@seo lowprofilelinks -->
+</div>
+<div class="sponsor">
+   <a rel="follow" title="Sponsor: Druckerei" href="http://print24.com/de/">Druckerei</a><!-- 2012070100250 ... -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: Managed Server" href="http://www.robhost.de">Managed Server</a><!-- 201210010720 klikics... -->
+</div>
+<div class="sponsor">
+   <a rel="follow" title="Sponsor: Stock Photography" href="http://www.fotosearch.com/">Stock Photography</a><!-- 2012040100250 ... -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: Autoteile" href="http://www.q11-shop.de">Autoteile</a><!-- 201205010540 suvalj -->
+</div>
+<div class="sponsor">
+   <a rel="follow" title="Sponsor: Royalty Free Stock Images" href="http://www.canstockphoto.com/">Royalty Free Stock Images</a><!-- 2012050100360 support@can -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: Web Hosting Reviews" href="http://www.webhostingsecretrevealed.com">Web Hosting Secret Revealed</a><!-- 201204010540 iamchee jerry -->
+</div>
+<div class="sponsor">
+  <a rel="follow" title="Sponsor: Druckerei" href="http://www.allesdruck.de">Druckerei</a><!-- 201303011500 r.leo -->
+</div>
+<div class="sponsor">
+   <a rel="follow" title="Sponsor: Free Catalogs" href="http://www.who-sells-it.com/">Free Catalogs</a><!-- 20120801000600 -->
+</div>
+<div class="sponsor">
+   <a rel="follow" title="Sponsor: Schlüsseldienst Berlin BSD" href="http://www.schluesseldienst-berlin.de">Schlüsseldienst Berlin BSD</a><!-- 2012050100025 info@schlues-->
+</div>
+</div>
+</div>
+</div>\r
+\r
+<div class="eastbar">\r
+  <div class="g-plusone" data-size="standard" data-count="false"></div>\r
+  <script type="text/javascript">\r
+    window.___gcfg = {\r
+      lang: 'en-US'\r
+    };\r
+\r
+    (function() {\r
+      var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;\r
+      po.src = 'https://apis.google.com/js/plusone.js';\r
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);\r
+    })();\r
+  </script>\r
+</div>\r
+\r
+<div class="main">\r
+\r
+<h1>ImageMagick Convert Command-line Tool</h1>
+<p class="navigation-index">[<a href="#usage">Example Usage</a> &bull; <a href="#options">Option Summary</a>]</p>
+
+<div class="doc-section">
+<p>Use the <kbd>magick</kbd> program to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.   See <a href="../www/command-line-processing.html">Command Line Processing</a> for advice on how to structure your <kbd>magick</kbd> command or see below for example usages of the command.</p>
+</div>
+
+<h2><a id="usage"></a>Example Usage</h2>
+<div class="doc-section">
+
+<p>We list a few examples of the <kbd>magick</kbd> command here to illustrate its usefulness and ease of use.  To get started, lets convert an image in the JPEG format to PNG:</p>
+
+<p class='crt'><span class="crtprompt"> $ </span><span class='crtin'>magick rose.jpg rose.png</span></p>
+<p>Next, we reduce the image size before it is written to the PNG format:</p>
+
+<p class='crt'><span class="crtprompt"> $ </span><span class='crtin'>magick rose.jpg -resize 50% rose.png</span></p>
+<p class="image">
+  <a href="../images/rose.jpg">
+  <img src="../images/rose.jpg" width="70" height="46" alt="rose" />
+  </a>
+  <img style="margin-top:13px; margin-bottom:13px;" src="../images/right.gif" width="20" height="20" alt="==>" />
+  <a href="../images/rose.png">
+  <img style="margin-top:11px; margin-bottom:12px;" src="../images/rose.png" width="35" height="23" alt="rose" />
+  </a>
+</p>
+
+<p>You can combine multiple image-processing operations to produce complex results:</p>
+
+<p class='crt'><span class="crtprompt"> $ </span><span class='crtin'>magick -size 320x85 canvas:none -font Bookman-DemiItalic -pointsize 72 \ <br/>
+-draw "text 25,60 'Magick'" -channel RGBA -blur 0x6 -fill darkred -stroke magenta \ <br/>
+-draw "text 20,55 'Magick'" fuzzy-magick.png</span></p>
+<p class="image">
+  <a href="../images/fuzzy-magick.png"><img src="../images/fuzzy-magick.png" width="320" height="85" alt="fuzzy-magick" /></a>
+</p>
+
+<p>You can find additional examples of using <kbd>magick</kbd> in <a href="http://www.imagemagick.org/Usage/">Examples of ImageMagick Usage</a>.</p>
+
+</div>
+
+<h2><a id="options"></a>Option Summary</h2>
+<div class="doc-section">
+
+<p>The <kbd>magick</kbd> command recognizes these options.  Click on an option to get more details about how that option works.</p>
+
+<table class="doc">
+  <tbody>
+  <tr>
+    <th align="left">Option</th>
+    <th align="left">Description</th>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#adaptive-blur">-adaptive-blur <em class="option">geometry</em></a></td>
+    <td valign="top">adaptively blur pixels; decrease effect near edges</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#adaptive-resize">-adaptive-resize <em class="option">geometry</em></a></td>
+    <td valign="top">adaptively resize image with data dependent triangulation.</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#adaptive-sharpen">-adaptive-sharpen <em class="option">geometry</em></a></td>
+    <td valign="top">adaptively sharpen pixels; increase effect near edges</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#adjoin">-adjoin</a></td>
+    <td valign="top">join images into a single multi-image file</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#affine">-affine <em class="option">matrix</em></a></td>
+    <td valign="top">affine transform matrix</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#alpha">-alpha</a></td>
+    <td valign="top">on, activate, off, deactivate, set, opaque, copy",
+transparent, extract, background, or shape the alpha channel</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#annotate">-annotate <em class="option">geometry text</em></a></td>
+    <td valign="top">annotate the image with text</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#antialias">-antialias</a></td>
+    <td valign="top">remove pixel-aliasing</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#append">-append</a></td>
+    <td valign="top">append an image sequence</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#authenticate">-authenticate <em class="option">value</em></a></td>
+    <td valign="top">decipher image with this password</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#auto-gamma">-auto-gamma</a></td>
+    <td valign="top">automagically adjust gamma level of image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#auto-level">-auto-level</a></td>
+    <td valign="top">automagically adjust color levels of image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#auto-orient">-auto-orient</a></td>
+    <td valign="top">automagically orient image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#background">-background <em class="option">color</em></a></td>
+    <td valign="top">background color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#bench">-bench <em class="option">iterations</em></a></td>
+    <td valign="top">measure performance</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#bias">-bias <em class="option">value</em></a></td>
+    <td valign="top">add bias when convolving an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#black-threshold">-black-threshold <em class="option">value</em></a></td>
+    <td valign="top">force all pixels below the threshold into black</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#blue-primary">-blue-primary <em class="option">point</em></a></td>
+    <td valign="top">chromaticity blue primary point</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#blue-shift">-blue-shift <em class="option">factor</em></a></td>
+    <td valign="top">simulate a scene at nighttime in the moonlight</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#blur">-blur <em class="option">geometry</em></a></td>
+    <td valign="top">reduce image noise and reduce detail levels</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#border">-border <em class="option">geometry</em></a></td>
+    <td valign="top">surround image with a border of color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#bordercolor">-bordercolor <em class="option">color</em></a></td>
+    <td valign="top">border color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#brightness-contrast">-brightness-contrast <em class="option">geometry</em></a></td>
+    <td valign="top">improve brightness / contrast of the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#caption">-caption <em class="option">string</em></a></td>
+    <td valign="top">assign a caption to an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#cdl">-cdl <em class="option">filename</em></a></td>
+    <td valign="top">color correct with a color decision list</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#channel">-channel <em class="option">type</em></a></td>
+    <td valign="top">apply option to select image channels</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#charcoal">-charcoal <em class="option">radius</em></a></td>
+    <td valign="top">simulate a charcoal drawing</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#chop">-chop <em class="option">geometry</em></a></td>
+    <td valign="top">remove pixels from the image interior</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#clamp">-clamp</a></td>
+    <td valign="top">restrict colors from 0 to the quantum depth</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#clip">-clip</a></td>
+    <td valign="top">clip along the first path from the 8BIM profile</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#clip-mask">-clip-mask</a> <em class="option">filename</em></td>
+    <td valign="top">associate clip mask with the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#clip-path">-clip-path <em class="option">id</em></a></td>
+    <td valign="top">clip along a named path from the 8BIM profile</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#clone">-clone <em class="option">index</em></a></td>
+    <td valign="top">clone an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#clut">-clut</a></td>
+    <td valign="top">apply a color lookup table to the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#contrast-stretch">-contrast-stretch <em class="option">geometry</em></a></td>
+    <td valign="top">improve the contrast in an image by `stretching' the range of intensity value</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#coalesce">-coalesce</a></td>
+    <td valign="top">merge a sequence of images</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#colorize">-colorize <em class="option">value</em></a></td>
+    <td valign="top">colorize the image with the fill color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#color-matrix">-color-matrix <em class="option">matrix</em></a></td>
+    <td valign="top">apply color correction to the image.</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#colors">-colors <em class="option">value</em></a></td>
+    <td valign="top">preferred number of colors in the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#colorspace">-colorspace <em class="option">type</em></a></td>
+    <td valign="top">set image colorspace</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#combine">-combine</a></td>
+    <td valign="top">combine a sequence of images</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#comment">-comment <em class="option">string</em></a></td>
+    <td valign="top">annotate image with comment</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#compose">-compose <em class="option">operator</em></a></td>
+    <td valign="top">set image composite operator</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#composite">-composite</a></td>
+    <td valign="top">composite image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#compress">-compress <em class="option">type</em></a></td>
+    <td valign="top">image compression type</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#contrast">-contrast</a></td>
+    <td valign="top">enhance or reduce the image contrast</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#convolve">-convolve <em class="option">coefficients</em></a></td>
+    <td valign="top">apply a convolution kernel to the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#crop">-crop <em class="option">geometry</em></a></td>
+    <td valign="top">crop the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#cycle">-cycle <em class="option">amount</em></a></td>
+    <td valign="top">cycle the image colormap</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#decipher">-decipher <em class="option">filename</em></a></td>
+    <td valign="top">magick cipher pixels to plain</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#debug">-debug <em class="option">events</em></a></td>
+    <td valign="top">display copious debugging information</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#define">-define <em class="option">format:option</em></a></td>
+    <td valign="top">define one or more image format options</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#deconstruct">-deconstruct</a></td>
+    <td valign="top">break down an image sequence into constituent parts</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#delay">-delay <em class="option">value</em></a></td>
+    <td valign="top">display the next image after pausing</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#delete">-delete <em class="option">index</em></a></td>
+    <td valign="top">delete the image from the image sequence</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#density">-density <em class="option">geometry</em></a></td>
+    <td valign="top">horizontal and vertical density of the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#depth">-depth <em class="option">value</em></a></td>
+    <td valign="top">image depth</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#despeckle">-despeckle</a></td>
+    <td valign="top">reduce the speckles within an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#direction">-direction <em class="option">type</em></a></td>
+    <td valign="top">render text right-to-left or left-to-right</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#display">-display <em class="option">server</em></a></td>
+    <td valign="top">get image or font from this X server</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#dispose">-dispose <em class="option">method</em></a></td>
+    <td valign="top">layer disposal method</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#distort">-distort <em class="option">type coefficients</em></a></td>
+    <td valign="top">distort image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#dither">-dither  <em class="option">method</em></a></td>
+    <td valign="top">apply error diffusion to image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#draw">-draw <em class="option">string</em></a></td>
+    <td valign="top">annotate the image with a graphic primitive</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#duplicate">-duplicate <em class="option">count,indexes</em></a></td>
+    <td valign="top">duplicate an image one or more times</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#edge">-edge <em class="option">radius</em></a></td>
+    <td valign="top">apply a filter to detect edges in the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#emboss">-emboss <em class="option">radius</em></a></td>
+    <td valign="top">emboss an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#encipher">-encipher <em class="option">filename</em></a></td>
+    <td valign="top">convert plain pixels to cipher pixels</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#encoding">-encoding <em class="option">type</em></a></td>
+    <td valign="top">text encoding type</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#endian">-endian <em class="option">type</em></a></td>
+    <td valign="top">endianness (MSB or LSB) of the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#enhance">-enhance</a></td>
+    <td valign="top">apply a digital filter to enhance a noisy image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#equalize">-equalize</a></td>
+    <td valign="top">perform histogram equalization to an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#evaluate">-evaluate <em class="option">operator value</em></a></td>
+    <td valign="top">evaluate an arithmetic, relational, or logical expression</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#evaluate-sequence">-evaluate-sequence <em class="option">operator</em></a></td>
+    <td valign="top">evaluate an arithmetic, relational, or logical expression for an image sequence</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#extent">-extent <em class="option">geometry</em></a></td>
+    <td valign="top">set the image size</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#extract">-extract <em class="option">geometry</em></a></td>
+    <td valign="top">extract area from image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#family">-family <em class="option">name</em></a></td>
+    <td valign="top">render text with this font family</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#fft">-fft</a></td>
+    <td valign="top">implments the discrete Fourier transform (DFT)</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#fill">-fill <em class="option">color</em></a></td>
+    <td valign="top">color to use when filling a graphic primitive</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#filter">-filter <em class="option">type</em></a></td>
+    <td valign="top">use this filter when resizing an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#flatten">-flatten</a></td>
+    <td valign="top">flatten a sequence of images</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#flip">-flip</a></td>
+    <td valign="top">flip image in the vertical direction</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#floodfill">-floodfill <em class="option">geometry color</em></a></td>
+    <td valign="top">floodfill the image with color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#flop">-flop</a></td>
+    <td valign="top">flop image in the horizontal direction</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#font">-font <em class="option">name</em></a></td>
+    <td valign="top">render text with this font</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#format_identify_">-format <em class="option">string</em></a></td>
+    <td valign="top">output formatted image characteristics</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#frame">-frame <em class="option">geometry</em></a></td>
+    <td valign="top">surround image with an ornamental border</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#function">-function <em class="option">name</em></a></td>
+    <td valign="top">apply a function to the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#fuzz">-fuzz <em class="option">distance</em></a></td>
+    <td valign="top">colors within this distance are considered equal</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#fx">-fx <em class="option">expression</em></a></td>
+    <td valign="top">apply mathematical expression to an image channel(s)</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#gamma">-gamma <em class="option">value</em></a></td>
+    <td valign="top">level of gamma correction</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#gaussian-blur">-gaussian-blur <em class="option">geometry</em></a></td>
+    <td valign="top">reduce image noise and reduce detail levels</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#geometry">-geometry <em class="option">geometry</em></a></td>
+    <td valign="top">preferred size or location of the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#gravity">-gravity <em class="option">type</em></a></td>
+    <td valign="top">horizontal and vertical text placement</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#green-primary">-green-primary <em class="option">point</em></a></td>
+    <td valign="top">chromaticity green primary point</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#help">-help</a></td>
+    <td valign="top">print program options</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#identify">-identify</a></td>
+    <td valign="top">identify the format and characteristics of the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#ift">-ift</a></td>
+    <td valign="top">implements the inverse discrete Fourier transform (DFT)</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#implode">-implode <em class="option">amount</em></a></td>
+    <td valign="top">implode image pixels about the center</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#insert">-insert <em class="option">index</em></a></td>
+    <td valign="top">insert last image into the image sequence</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#intent">-intent <em class="option">type</em></a></td>
+    <td valign="top">type of rendering intent when managing the image color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#interlace">-interlace <em class="option">type</em></a></td>
+    <td valign="top">type of image interlacing scheme</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#interline-spacing">-interline-spacing <em class="option">value</em></a></td>
+    <td valign="top">the space between two text lines</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#interpolate">-interpolate <em class="option">method</em></a></td>
+    <td valign="top">pixel color interpolation method</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#interword-spacing">-interword-spacing <em class="option">value</em></a></td>
+    <td valign="top">the space between two words</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#kerning">-kerning <em class="option">value</em></a></td>
+    <td valign="top">the space between two characters</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#label">-label <em class="option">string</em></a></td>
+    <td valign="top">assign a label to an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#lat">-lat <em class="option">geometry</em></a></td>
+    <td valign="top">local adaptive thresholding</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#layers">-layers <em class="option">method</em></a></td>
+    <td valign="top">optimize or compare image layers</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#level">-level <em class="option">value</em></a></td>
+    <td valign="top">adjust the level of image contrast</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#limit">-limit <em class="option">type value</em></a></td>
+    <td valign="top">pixel cache resource limit</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#linear-stretch">-linear-stretch <em class="option">geometry</em></a></td>
+    <td valign="top">linear with saturation histogram stretch</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#liquid-rescale">-liquid-rescale <em class="option">geometry</em></a></td>
+    <td valign="top">rescale image with seam-carving</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#log">-log <em class="option">format</em></a></td>
+    <td valign="top">format of debugging information</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#loop">-loop <em class="option">iterations</em></a></td>
+    <td valign="top">add Netscape loop extension to your GIF animation</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#mask">-mask <em class="option">filename</em></a></td>
+    <td valign="top">associate a mask with the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#mattecolor">-mattecolor <em class="option">color</em></a></td>
+    <td valign="top">frame color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#median">-median <em class="option">radius</em></a></td>
+    <td valign="top">apply a median filter to the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#mode">-mode <em class="option">radius</em></a></td>
+    <td valign="top">make each pixel the 'predominant color' of the neighborhood</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#modulate">-modulate <em class="option">value</em></a></td>
+    <td valign="top">vary the brightness, saturation, and hue</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#monitor">-monitor</a></td>
+    <td valign="top">monitor progress</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#monochrome">-monochrome</a></td>
+    <td valign="top">transform image to black and white</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#morph">-morph <em class="option">value</em></a></td>
+    <td valign="top">morph an image sequence</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#morphology">-morphology <em class="option">method</em></a> <em class="option">kernel</em></td>
+    <td valign="top">apply a morphology method to the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#motion-blur">-motion-blur <em class="option">geometry</em></a></td>
+    <td valign="top">simulate motion blur</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#negate">-negate</a></td>
+    <td valign="top">replace each pixel with its complementary color </td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#noise">-noise <em class="option">radius</em></a></td>
+    <td valign="top">add or reduce noise in an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#normalize">-normalize</a></td>
+    <td valign="top">transform image to span the full range of colors</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#opaque">-opaque <em class="option">color</em></a></td>
+    <td valign="top">change this color to the fill color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#ordered-dither">-ordered-dither <em class="option">NxN</em></a></td>
+    <td valign="top">ordered dither the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#orient">-orient <em class="option">type</em></a></td>
+    <td valign="top">image orientation</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#page">-page <em class="option">geometry</em></a></td>
+    <td valign="top">size and location of an image canvas (setting)</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#paint">-paint <em class="option">radius</em></a></td>
+    <td valign="top">simulate an oil painting</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#ping">-ping</a></td>
+    <td valign="top">efficiently determine image attributes</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#pointsize">-pointsize <em class="option">value</em></a></td>
+    <td valign="top">font point size</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#polaroid">-polaroid <em class="option">angle</em></a></td>
+    <td valign="top">simulate a Polaroid picture</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#posterize">-posterize <em class="option">levels</em></a></td>
+    <td valign="top">reduce the image to a limited number of color levels</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#precision">-precision <em class="option">value</em></a></td>
+    <td valign="top">set the maximum number of significant digits to be printed</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#preview">-preview <em class="option">type</em></a></td>
+    <td valign="top">image preview type</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#print">-print <em class="option">string</em></a></td>
+    <td valign="top">interpret string and print to console</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#process">-process <em class="option">image-filter</em></a></td>
+    <td valign="top">process the image with a custom image filter</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#profile">-profile <em class="option">filename</em></a></td>
+    <td valign="top">add, delete, or apply an image profile</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#quality">-quality <em class="option">value</em></a></td>
+    <td valign="top">JPEG/MIFF/PNG compression level</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#quantize">-quantize <em class="option">colorspace</em></a></td>
+    <td valign="top">reduce image colors in this colorspace</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#quiet">-quiet</a></td>
+    <td valign="top">suppress all warning messages</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#radial-blur">-radial-blur <em class="option">angle</em></a></td>
+    <td valign="top">radial blur the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#raise">-raise <em class="option">value</em></a></td>
+    <td valign="top">lighten/darken image edges to create a 3-D effect</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#random-threshold">-random-threshold <em class="option">low,high</em></a></td>
+    <td valign="top">random threshold the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#red-primary">-red-primary <em class="option">point</em></a></td>
+    <td valign="top">chromaticity red primary point</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#regard-warnings">-regard-warnings</a></td>
+    <td valign="top">pay attention to warning messages.</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#region">-region <em class="option">geometry</em></a></td>
+    <td valign="top">apply options to a portion of the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#remap">-remap <em class="option">filename</em></a></td>
+    <td valign="top">transform image colors to match this set of colors</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#render">-render</a></td>
+    <td valign="top">render vector graphics</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#repage">-repage <em class="option">geometry</em></a></td>
+    <td valign="top">size and location of an image canvas</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#resample">-resample <em class="option">geometry</em></a></td>
+    <td valign="top">change the resolution of an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#resize">-resize <em class="option">geometry</em></a></td>
+    <td valign="top">resize the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#respect-parentheses">-respect-parentheses</a></td>
+    <td valign="top">settings remain in effect until parenthesis boundary.</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#roll">-roll <em class="option">geometry</em></a></td>
+    <td valign="top">roll an image vertically or horizontally</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#rotate">-rotate <em class="option">degrees</em></a></td>
+    <td valign="top">apply Paeth rotation to the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#sample">-sample <em class="option">geometry</em></a></td>
+    <td valign="top">scale image with pixel sampling</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#sampling-factor">-sampling-factor <em class="option">geometry</em></a></td>
+    <td valign="top">horizontal and vertical sampling factor</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#scale">-scale <em class="option">geometry</em></a></td>
+    <td valign="top">scale the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#scene">-scene <em class="option">value</em></a></td>
+    <td valign="top">image scene number</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#seed">-seed <em class="option">value</em></a></td>
+    <td valign="top">seed a new sequence of pseudo-random numbers</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#segment">-segment <em class="option">values</em></a></td>
+    <td valign="top">segment an image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#threshold">-selective-blur <em class="option">geometry</em></a></td>
+    <td valign="top">selectively blur pixels within a contrast threshold</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#separate">-separate</a></td>
+    <td valign="top">separate an image channel into a grayscale image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#sepia-tone">-sepia-tone <em class="option">threshold</em></a></td>
+    <td valign="top">simulate a sepia-toned photo</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#set">-set <em class="option">attribute value</em></a></td>
+    <td valign="top">set an image attribute</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#shade">-shade <em class="option">degrees</em></a></td>
+    <td valign="top">shade the image using a distant light source</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#shadow">-shadow <em class="option">geometry</em></a></td>
+    <td valign="top">simulate an image shadow</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#sharpen">-sharpen <em class="option">geometry</em></a></td>
+    <td valign="top">sharpen the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#shave">-shave <em class="option">geometry</em></a></td>
+    <td valign="top">shave pixels from the image edges</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#shear">-shear <em class="option">geometry</em></a></td>
+    <td valign="top">slide one edge of the image along the X or Y axis</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#sigmoidal">-sigmoidal-contrast <em class="option">geometry</em></a></td>
+    <td valign="top">increase the contrast without saturating highlights or shadows</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#smush">-smush <em class="option">offset</em></a></td>
+    <td valign="top">smush an image sequence together</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#size">-size <em class="option">geometry</em></a></td>
+    <td valign="top">width and height of image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#sketch">-sketch <em class="option">geometry</em></a></td>
+    <td valign="top">simulate a pencil sketch</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#solarize">-solarize <em class="option">threshold</em></a></td>
+    <td valign="top">negate all pixels above the threshold level</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#splice">-splice <em class="option">geometry</em></a></td>
+    <td valign="top">splice the background color into the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#spread">-spread <em class="option">radius</em></a></td>
+    <td valign="top">displace image pixels by a random amount</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#statistic">-statistic <em class="option">type</em> <em class="option">geometry</em></a></td>
+    <td valign="top">replace each pixel with corresponding statistic from the neighborhood</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#strip">-strip</a></td>
+    <td valign="top">strip image of all profiles and comments</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#stroke">-stroke <em class="option">color</em></a></td>
+    <td valign="top">graphic primitive stroke color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#strokewidth">-strokewidth <em class="option">value</em></a></td>
+    <td valign="top">graphic primitive stroke width</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#stretch">-stretch <em class="option">type</em></a></td>
+    <td valign="top">render text with this font stretch</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#style">-style <em class="option">type</em></a></td>
+    <td valign="top">render text with this font style</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#swap">-swap <em class="option">indexes</em></a></td>
+    <td valign="top">swap two images in the image sequence</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#swirl">-swirl <em class="option">degrees</em></a></td>
+    <td valign="top">swirl image pixels about the center</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#synchronize">-synchronize</a></td>
+    <td valign="top">synchronize image to storage device</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#taint">-taint</a></td>
+    <td valign="top">mark the image as modified</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#texture">-texture <em class="option">filename</em></a></td>
+    <td valign="top">name of texture to tile onto the image background</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#threshold">-threshold <em class="option">value</em></a></td>
+    <td valign="top">threshold the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#thumbnail">-thumbnail <em class="option">geometry</em></a></td>
+    <td valign="top">create a thumbnail of the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#tile">-tile <em class="option">filename</em></a></td>
+    <td valign="top">tile image when filling a graphic primitive</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#tile-offset">-tile-offset <em class="option">geometry</em></a></td>
+    <td valign="top">set the image tile offset</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#tint">-tint <em class="option">value</em></a></td>
+    <td valign="top">tint the image with the fill color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#transform">-transform</a></td>
+    <td valign="top">affine transform image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#transparent">-transparent <em class="option">color</em></a></td>
+    <td valign="top">make this color transparent within the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#transparent-color">-transparent-color <em class="option">color</em></a></td>
+    <td valign="top">transparent color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#transpose">-transpose</a></td>
+    <td valign="top">flip image in the vertical direction and rotate 90 degrees</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#transverse">-transverse</a></td>
+    <td valign="top">flop image in the horizontal direction and rotate 270 degrees</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#treedepth">-treedepth <em class="option">value</em></a></td>
+    <td valign="top">color tree depth</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#trim">-trim</a></td>
+    <td valign="top">trim image edges</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#type">-type <em class="option">type</em></a></td>
+    <td valign="top">image type</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#undercolor">-undercolor <em class="option">color</em></a></td>
+    <td valign="top">annotation bounding box color</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#unique-colors">-unique-colors</a></td>
+    <td valign="top">discard all but one of any pixel color.</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#units">-units <em class="option">type</em></a></td>
+    <td valign="top">the units of image resolution</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#unsharp">-unsharp <em class="option">geometry</em></a></td>
+    <td valign="top">sharpen the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#verbose">-verbose</a></td>
+    <td valign="top">print detailed information about the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#version">-version</a></td>
+    <td valign="top">print version information</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#view">-view</a></td>
+    <td valign="top">FlashPix viewing transforms</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#vignette">-vignette <em class="option">geometry</em></a></td>
+    <td valign="top">soften the edges of the image in vignette style</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#virtual-pixel">-virtual-pixel <em class="option">method</em></a></td>
+    <td valign="top">access method for pixels outside the boundaries of the image</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#wave">-wave <em class="option">geometry</em></a></td>
+    <td valign="top">alter an image along a sine wave</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#weight">-weight <em class="option">type</em></a></td>
+    <td valign="top">render text with this font weight</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#white-point">-white-point <em class="option">point</em></a></td>
+    <td valign="top">chromaticity white point</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#white-threshold">-white-threshold <em class="option">value</em></a></td>
+    <td valign="top">force all pixels above the threshold into white</td>
+  </tr>
+
+  <tr>
+    <td valign="top"><a href="../www/command-line-options.html#write">-write <em class="option">filename</em></a></td>
+    <td valign="top">write images to this file</td>
+  </tr>
+
+  </tbody>
+</table>
+
+</div>
+\r
+</div>\r
+\r
+<div id="linkbar">\r
+    <span id="linkbar-west">&nbsp;</span>\r
+    <span id="linkbar-center">\r
+      <a href="http://www.imagemagick.org/discourse-server/">Discourse Server</a> &bull;\r
+      <a href="http://www.imagemagick.org/MagickStudio/scripts/MagickStudio.cgi">Studio</a>\r
+    </span>\r
+    <span id="linkbar-east">&nbsp;</span>\r
+  </div>\r
+  <div class="footer">\r
+    <span id="footer-west">&copy; 1999-2011 ImageMagick Studio LLC</span>\r
+    <span id="footer-east"> <a href="http://www.imagemagick.org/script/contact.php">Contact the Wizards</a></span>\r
+  </div>\r
+  <div style="clear: both; margin: 0; width: 100%; "></div>\r
+  <script type="text/javascript">\r
+    var _gaq = _gaq || [];\r
+    _gaq.push(['_setAccount', 'UA-17690367-1']);\r
+    _gaq.push(['_trackPageview']);\r
+\r
+    (function() {\r
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;\r
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';\r
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);\r
+    })();\r
+  </script>\r
+</body>\r
+</html>\r