From: cristy Date: Tue, 20 Mar 2012 17:05:01 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~6005 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=71d8c20e7652214543bd9cb6043bc0bd367b776a;p=imagemagick --- diff --git a/Install-unix.txt b/Install-unix.txt index e5d0df257..8a9c65a4a 100644 --- a/Install-unix.txt +++ b/Install-unix.txt @@ -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). diff --git a/MagickCore/version.h b/MagickCore/version.h index 276d3c628..17c3eca38 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,14 +27,14 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "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) diff --git a/Makefile.in b/Makefile.in index f156a2a87..06557993b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -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) \ diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 720a4c965..75f75d325 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-03-19 + 2012-03-20 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 stable - 2012-03-19 + 2012-03-20 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index 70ae1c9dd..d520f0c06 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 1c9778c83..fd6f515aa 100755 --- 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. diff --git a/configure.ac b/configure.ac index 9e56c9a87..f374d87d0 100755 --- a/configure.ac +++ b/configure.ac @@ -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], diff --git a/utilities/Makefile.am b/utilities/Makefile.am index 25bd19893..4f1e72813 100644 --- a/utilities/Makefile.am +++ b/utilities/Makefile.am @@ -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 index 000000000..efc2541f2 --- /dev/null +++ b/utilities/magick.1 @@ -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 index 000000000..38d9b592e --- /dev/null +++ b/utilities/magick.1.in @@ -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 index 000000000..57b7ec829 --- /dev/null +++ b/www/magick.html @@ -0,0 +1,1423 @@ + + + + + + + ImageMagick: Command-line Tools: Convert + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ + ImageMagick Logo + + ImageMagick Sprite +
+ +
+ +
+ About ImageMagick +
+
+ Binary Releases +
+
+ Unix +
+
+ Mac OS X +
+
+ iOS +
+
+ Windows +
+
+
+ Command-line Tools +
+
+ Processing +
+
+ Options +
+
+ Usage +
+
+ Program Interfaces +
+
+ MagickWand +
+
+ MagickCore +
+
+ PerlMagick +
+
+ Magick++ +
+
+
+ Install from Source +
+
+ Unix +
+
+ Windows +
+
+ Resources +
+
+ Architecture +
+
+ Download +
+
+
+ Search +
+
+
+ Site Map +
+
+ Links +
+
+
+ Sponsors: + + [sponsor] + [sponsor] +
+ + + + + + + + + + + + + + + + + +
+
+
+ +
+
+ +
+ +
+ +

ImageMagick Convert Command-line Tool

+

[Example Usage • Option Summary]

+ +
+

Use the magick 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 Command Line Processing for advice on how to structure your magick command or see below for example usages of the command.

+
+ +

Example Usage

+
+ +

We list a few examples of the magick command here to illustrate its usefulness and ease of use. To get started, lets convert an image in the JPEG format to PNG:

+ +

$ magick rose.jpg rose.png

+

Next, we reduce the image size before it is written to the PNG format:

+ +

$ magick rose.jpg -resize 50% rose.png

+

+ + rose + + ==> + + rose + +

+ +

You can combine multiple image-processing operations to produce complex results:

+ +

$ magick -size 320x85 canvas:none -font Bookman-DemiItalic -pointsize 72 \
+-draw "text 25,60 'Magick'" -channel RGBA -blur 0x6 -fill darkred -stroke magenta \
+-draw "text 20,55 'Magick'" fuzzy-magick.png

+

+ fuzzy-magick +

+ +

You can find additional examples of using magick in Examples of ImageMagick Usage.

+ +
+ +

Option Summary

+
+ +

The magick command recognizes these options. Click on an option to get more details about how that option works.

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
OptionDescription
-adaptive-blur geometryadaptively blur pixels; decrease effect near edges
-adaptive-resize geometryadaptively resize image with data dependent triangulation.
-adaptive-sharpen geometryadaptively sharpen pixels; increase effect near edges
-adjoinjoin images into a single multi-image file
-affine matrixaffine transform matrix
-alphaon, activate, off, deactivate, set, opaque, copy", +transparent, extract, background, or shape the alpha channel
-annotate geometry textannotate the image with text
-antialiasremove pixel-aliasing
-appendappend an image sequence
-authenticate valuedecipher image with this password
-auto-gammaautomagically adjust gamma level of image
-auto-levelautomagically adjust color levels of image
-auto-orientautomagically orient image
-background colorbackground color
-bench iterationsmeasure performance
-bias valueadd bias when convolving an image
-black-threshold valueforce all pixels below the threshold into black
-blue-primary pointchromaticity blue primary point
-blue-shift factorsimulate a scene at nighttime in the moonlight
-blur geometryreduce image noise and reduce detail levels
-border geometrysurround image with a border of color
-bordercolor colorborder color
-brightness-contrast geometryimprove brightness / contrast of the image
-caption stringassign a caption to an image
-cdl filenamecolor correct with a color decision list
-channel typeapply option to select image channels
-charcoal radiussimulate a charcoal drawing
-chop geometryremove pixels from the image interior
-clamprestrict colors from 0 to the quantum depth
-clipclip along the first path from the 8BIM profile
-clip-mask filenameassociate clip mask with the image
-clip-path idclip along a named path from the 8BIM profile
-clone indexclone an image
-clutapply a color lookup table to the image
-contrast-stretch geometryimprove the contrast in an image by `stretching' the range of intensity value
-coalescemerge a sequence of images
-colorize valuecolorize the image with the fill color
-color-matrix matrixapply color correction to the image.
-colors valuepreferred number of colors in the image
-colorspace typeset image colorspace
-combinecombine a sequence of images
-comment stringannotate image with comment
-compose operatorset image composite operator
-compositecomposite image
-compress typeimage compression type
-contrastenhance or reduce the image contrast
-convolve coefficientsapply a convolution kernel to the image
-crop geometrycrop the image
-cycle amountcycle the image colormap
-decipher filenamemagick cipher pixels to plain
-debug eventsdisplay copious debugging information
-define format:optiondefine one or more image format options
-deconstructbreak down an image sequence into constituent parts
-delay valuedisplay the next image after pausing
-delete indexdelete the image from the image sequence
-density geometryhorizontal and vertical density of the image
-depth valueimage depth
-despecklereduce the speckles within an image
-direction typerender text right-to-left or left-to-right
-display serverget image or font from this X server
-dispose methodlayer disposal method
-distort type coefficientsdistort image
-dither methodapply error diffusion to image
-draw stringannotate the image with a graphic primitive
-duplicate count,indexesduplicate an image one or more times
-edge radiusapply a filter to detect edges in the image
-emboss radiusemboss an image
-encipher filenameconvert plain pixels to cipher pixels
-encoding typetext encoding type
-endian typeendianness (MSB or LSB) of the image
-enhanceapply a digital filter to enhance a noisy image
-equalizeperform histogram equalization to an image
-evaluate operator valueevaluate an arithmetic, relational, or logical expression
-evaluate-sequence operatorevaluate an arithmetic, relational, or logical expression for an image sequence
-extent geometryset the image size
-extract geometryextract area from image
-family namerender text with this font family
-fftimplments the discrete Fourier transform (DFT)
-fill colorcolor to use when filling a graphic primitive
-filter typeuse this filter when resizing an image
-flattenflatten a sequence of images
-flipflip image in the vertical direction
-floodfill geometry colorfloodfill the image with color
-flopflop image in the horizontal direction
-font namerender text with this font
-format stringoutput formatted image characteristics
-frame geometrysurround image with an ornamental border
-function nameapply a function to the image
-fuzz distancecolors within this distance are considered equal
-fx expressionapply mathematical expression to an image channel(s)
-gamma valuelevel of gamma correction
-gaussian-blur geometryreduce image noise and reduce detail levels
-geometry geometrypreferred size or location of the image
-gravity typehorizontal and vertical text placement
-green-primary pointchromaticity green primary point
-helpprint program options
-identifyidentify the format and characteristics of the image
-iftimplements the inverse discrete Fourier transform (DFT)
-implode amountimplode image pixels about the center
-insert indexinsert last image into the image sequence
-intent typetype of rendering intent when managing the image color
-interlace typetype of image interlacing scheme
-interline-spacing valuethe space between two text lines
-interpolate methodpixel color interpolation method
-interword-spacing valuethe space between two words
-kerning valuethe space between two characters
-label stringassign a label to an image
-lat geometrylocal adaptive thresholding
-layers methodoptimize or compare image layers
-level valueadjust the level of image contrast
-limit type valuepixel cache resource limit
-linear-stretch geometrylinear with saturation histogram stretch
-liquid-rescale geometryrescale image with seam-carving
-log formatformat of debugging information
-loop iterationsadd Netscape loop extension to your GIF animation
-mask filenameassociate a mask with the image
-mattecolor colorframe color
-median radiusapply a median filter to the image
-mode radiusmake each pixel the 'predominant color' of the neighborhood
-modulate valuevary the brightness, saturation, and hue
-monitormonitor progress
-monochrometransform image to black and white
-morph valuemorph an image sequence
-morphology method kernelapply a morphology method to the image
-motion-blur geometrysimulate motion blur
-negatereplace each pixel with its complementary color
-noise radiusadd or reduce noise in an image
-normalizetransform image to span the full range of colors
-opaque colorchange this color to the fill color
-ordered-dither NxNordered dither the image
-orient typeimage orientation
-page geometrysize and location of an image canvas (setting)
-paint radiussimulate an oil painting
-pingefficiently determine image attributes
-pointsize valuefont point size
-polaroid anglesimulate a Polaroid picture
-posterize levelsreduce the image to a limited number of color levels
-precision valueset the maximum number of significant digits to be printed
-preview typeimage preview type
-print stringinterpret string and print to console
-process image-filterprocess the image with a custom image filter
-profile filenameadd, delete, or apply an image profile
-quality valueJPEG/MIFF/PNG compression level
-quantize colorspacereduce image colors in this colorspace
-quietsuppress all warning messages
-radial-blur angleradial blur the image
-raise valuelighten/darken image edges to create a 3-D effect
-random-threshold low,highrandom threshold the image
-red-primary pointchromaticity red primary point
-regard-warningspay attention to warning messages.
-region geometryapply options to a portion of the image
-remap filenametransform image colors to match this set of colors
-renderrender vector graphics
-repage geometrysize and location of an image canvas
-resample geometrychange the resolution of an image
-resize geometryresize the image
-respect-parenthesessettings remain in effect until parenthesis boundary.
-roll geometryroll an image vertically or horizontally
-rotate degreesapply Paeth rotation to the image
-sample geometryscale image with pixel sampling
-sampling-factor geometryhorizontal and vertical sampling factor
-scale geometryscale the image
-scene valueimage scene number
-seed valueseed a new sequence of pseudo-random numbers
-segment valuessegment an image
-selective-blur geometryselectively blur pixels within a contrast threshold
-separateseparate an image channel into a grayscale image
-sepia-tone thresholdsimulate a sepia-toned photo
-set attribute valueset an image attribute
-shade degreesshade the image using a distant light source
-shadow geometrysimulate an image shadow
-sharpen geometrysharpen the image
-shave geometryshave pixels from the image edges
-shear geometryslide one edge of the image along the X or Y axis
-sigmoidal-contrast geometryincrease the contrast without saturating highlights or shadows
-smush offsetsmush an image sequence together
-size geometrywidth and height of image
-sketch geometrysimulate a pencil sketch
-solarize thresholdnegate all pixels above the threshold level
-splice geometrysplice the background color into the image
-spread radiusdisplace image pixels by a random amount
-statistic type geometryreplace each pixel with corresponding statistic from the neighborhood
-stripstrip image of all profiles and comments
-stroke colorgraphic primitive stroke color
-strokewidth valuegraphic primitive stroke width
-stretch typerender text with this font stretch
-style typerender text with this font style
-swap indexesswap two images in the image sequence
-swirl degreesswirl image pixels about the center
-synchronizesynchronize image to storage device
-taintmark the image as modified
-texture filenamename of texture to tile onto the image background
-threshold valuethreshold the image
-thumbnail geometrycreate a thumbnail of the image
-tile filenametile image when filling a graphic primitive
-tile-offset geometryset the image tile offset
-tint valuetint the image with the fill color
-transformaffine transform image
-transparent colormake this color transparent within the image
-transparent-color colortransparent color
-transposeflip image in the vertical direction and rotate 90 degrees
-transverseflop image in the horizontal direction and rotate 270 degrees
-treedepth valuecolor tree depth
-trimtrim image edges
-type typeimage type
-undercolor colorannotation bounding box color
-unique-colorsdiscard all but one of any pixel color.
-units typethe units of image resolution
-unsharp geometrysharpen the image
-verboseprint detailed information about the image
-versionprint version information
-viewFlashPix viewing transforms
-vignette geometrysoften the edges of the image in vignette style
-virtual-pixel methodaccess method for pixels outside the boundaries of the image
-wave geometryalter an image along a sine wave
-weight typerender text with this font weight
-white-point pointchromaticity white point
-white-threshold valueforce all pixels above the threshold into white
-write filenamewrite images to this file
+ +
+ +
+ + +
+ © 1999-2011 ImageMagick Studio LLC + Contact the Wizards +
+
+ + +