From aa839e306e8a7c0a2497f577f52b8846fe7af24a Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 26 Mar 2012 12:09:39 +0000 Subject: [PATCH] --- MagickCore/version.h | 4 +- Makefile.in | 431 +++++++++++------------------------ config/ImageMagick.rdf | 4 +- config/configure.xml | 4 +- configure | 2 +- utilities/Makefile.am | 116 ++-------- utilities/magick-script.1 | 280 +++++++++++++++++++++++ utilities/magick-script.1.in | 280 +++++++++++++++++++++++ 8 files changed, 729 insertions(+), 392 deletions(-) create mode 100644 utilities/magick-script.1 create mode 100644 utilities/magick-script.1.in diff --git a/MagickCore/version.h b/MagickCore/version.h index f7134078f..8b144bb40 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 "7202" +#define MagickSVNRevision "7227" #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-25" +#define MagickReleaseDate "2012-03-26" #define MagickChangeDate "20110801" #define MagickAuthoritativeURL "http://www.imagemagick.org" #if defined(MAGICKCORE_OPENMP_SUPPORT) diff --git a/Makefile.in b/Makefile.in index ef5952bcf..fcd2560b0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1770,29 +1770,12 @@ 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 $@ -@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/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_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) am__EXEEXT_2 = tests/validate$(EXEEXT) am__EXEEXT_3 = Magick++/demo/analyze$(EXEEXT) \ Magick++/demo/button$(EXEEXT) Magick++/demo/demo$(EXEEXT) \ @@ -1919,166 +1902,88 @@ 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_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) +am_utilities_animate_OBJECTS = utilities/animate.$(OBJEXT) utilities_animate_OBJECTS = $(am_utilities_animate_OBJECTS) -@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_DEPENDENCIES = $(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_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) +am_utilities_compare_OBJECTS = utilities/compare.$(OBJEXT) utilities_compare_OBJECTS = $(am_utilities_compare_OBJECTS) -@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_DEPENDENCIES = $(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_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) +am_utilities_composite_OBJECTS = utilities/composite.$(OBJEXT) utilities_composite_OBJECTS = $(am_utilities_composite_OBJECTS) -@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_DEPENDENCIES = $(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_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) +am_utilities_conjure_OBJECTS = utilities/conjure.$(OBJEXT) utilities_conjure_OBJECTS = $(am_utilities_conjure_OBJECTS) -@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_DEPENDENCIES = $(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_SOURCES_DIST = utilities/convert.c -@LEGACY_SUPPORT_TRUE@am_utilities_convert_OBJECTS = \ -@LEGACY_SUPPORT_TRUE@ utilities/convert.$(OBJEXT) +am_utilities_convert_OBJECTS = utilities/convert.$(OBJEXT) utilities_convert_OBJECTS = $(am_utilities_convert_OBJECTS) -@LEGACY_SUPPORT_TRUE@utilities_convert_DEPENDENCIES = \ -@LEGACY_SUPPORT_TRUE@ $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) +utilities_convert_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS) utilities_convert_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \ $(AM_CFLAGS) $(CFLAGS) $(utilities_convert_LDFLAGS) $(LDFLAGS) \ -o $@ -am__utilities_display_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) +am_utilities_display_OBJECTS = utilities/display.$(OBJEXT) utilities_display_OBJECTS = $(am_utilities_display_OBJECTS) -@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_DEPENDENCIES = $(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_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) +am_utilities_identify_OBJECTS = utilities/identify.$(OBJEXT) utilities_identify_OBJECTS = $(am_utilities_identify_OBJECTS) -@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_DEPENDENCIES = $(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_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) +am_utilities_import_OBJECTS = utilities/import.$(OBJEXT) utilities_import_OBJECTS = $(am_utilities_import_OBJECTS) -@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_DEPENDENCIES = $(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_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) +am_utilities_magick_OBJECTS = utilities/magick.$(OBJEXT) utilities_magick_OBJECTS = $(am_utilities_magick_OBJECTS) -@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_DEPENDENCIES = $(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_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) +am_utilities_mogrify_OBJECTS = utilities/mogrify.$(OBJEXT) utilities_mogrify_OBJECTS = $(am_utilities_mogrify_OBJECTS) -@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_DEPENDENCIES = $(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_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) +am_utilities_montage_OBJECTS = utilities/montage.$(OBJEXT) utilities_montage_OBJECTS = $(am_utilities_montage_OBJECTS) -@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_DEPENDENCIES = $(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_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) +am_utilities_stream_OBJECTS = utilities/stream.$(OBJEXT) utilities_stream_OBJECTS = $(am_utilities_stream_OBJECTS) -@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_DEPENDENCIES = $(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) \ @@ -2303,19 +2208,13 @@ DIST_SOURCES = $(Magick___lib_libMagick___la_SOURCES) \ $(Magick___tests_readWriteBlob_SOURCES) \ $(Magick___tests_readWriteImages_SOURCES) \ $(MagickWand_drawtest_SOURCES) $(MagickWand_wandtest_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) + $(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) man1dir = $(mandir)/man1 NROFF = nroff MANS = $(man_MANS) @@ -4842,169 +4741,100 @@ 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) -@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/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_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 UTILITIES_XFAIL_TESTS = \ $(UTILITIES_TTF_XFAIL_TESTS) \ $(UTILITIES_XML_XFAIL_TESTS) -@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_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/magick.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/magick.1.in \ + utilities/mogrify.1.in \ + utilities/montage.1.in \ + utilities/stream.1.in UTILITIES_EXTRA_DIST = \ $(UTILITIES_MANS) \ $(UTILITIES_TESTS) UTILITIES_CLEANFILES = + +# Link these utilities to 'magick'. +MAGICKPROGRAMS = convert magick-script +UTILITIES_INSTALL_EXEC_LOCAL_TARGETS = install-exec-local-utilities +UTILITIES_UNINSTALL_LOCAL_TARGETS = uninstall-local-utilities TESTS_CHECK_PGRMS = \ tests/validate @@ -11505,6 +11335,23 @@ MagickCore-install-data-local: $(INSTALL_HEADER) MagickCore/magick-config.h $(DESTDIR)$(MagickCoreincdir)/magick-config.h MagickCore-uninstall-local: rm -f $(DESTDIR)$(MagickCoreincdir)/magick-config.h +install-exec-local-utilities: + $(mkdir_p) $(DESTDIR)$(bindir) + cd $(DESTDIR)$(bindir) ; \ + magick=`echo "magick" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for name in $(MAGICKPROGRAMS) ; \ + do \ + target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + rm -f $$target ; \ + $(LN_S) $$magick $$target ; \ + done +uninstall-local-utilities: + cd $(DESTDIR)$(bindir) ; \ + for name in $(MAGICKPROGRAMS) ; \ + do \ + target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + rm -f $$target ; \ + done # If source files missing, see if they can be obtained via VPATH perl-sources: diff --git a/config/ImageMagick.rdf b/config/ImageMagick.rdf index 7c51a4212..8e853e943 100644 --- a/config/ImageMagick.rdf +++ b/config/ImageMagick.rdf @@ -5,7 +5,7 @@ ImageMagick ImageMagick: convert, edit, and compose images. - 2012-03-25 + 2012-03-26 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-25 + 2012-03-26 7.0.0 diff --git a/config/configure.xml b/config/configure.xml index 5792c70e9..d26152947 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 3d4de99d1..614808046 100755 --- a/configure +++ b/configure @@ -3620,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=7202 +MAGICK_SVN_REVISION=7227 diff --git a/utilities/Makefile.am b/utilities/Makefile.am index 35cbcf414..9dfb3ce65 100644 --- a/utilities/Makefile.am +++ b/utilities/Makefile.am @@ -14,7 +14,6 @@ # # Makefile for building ImageMagick utilities. -if LEGACY_SUPPORT UTILITIES_PGMS = \ utilities/animate \ utilities/compare \ @@ -28,26 +27,11 @@ UTILITIES_PGMS = \ utilities/mogrify \ utilities/montage \ utilities/stream -else -UTILITIES_PGMS = \ - utilities/animate \ - utilities/compare \ - utilities/composite \ - utilities/conjure \ - 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 @@ -95,53 +79,7 @@ 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 \ @@ -156,23 +94,7 @@ UTILITIES_MANS = \ 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 \ @@ -187,24 +109,32 @@ UTILITIES_CONFIGURE = \ 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) \ $(UTILITIES_TESTS) UTILITIES_CLEANFILES = + +# Link these utilities to 'magick'. +MAGICKPROGRAMS=convert magick-script +UTILITIES_INSTALL_EXEC_LOCAL_TARGETS=install-exec-local-utilities +install-exec-local-utilities: + $(mkdir_p) $(DESTDIR)$(bindir) + cd $(DESTDIR)$(bindir) ; \ + magick=`echo "magick" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + for name in $(MAGICKPROGRAMS) ; \ + do \ + target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + rm -f $$target ; \ + $(LN_S) $$magick $$target ; \ + done + +UTILITIES_UNINSTALL_LOCAL_TARGETS=uninstall-local-utilities +uninstall-local-utilities: + cd $(DESTDIR)$(bindir) ; \ + for name in $(MAGICKPROGRAMS) ; \ + do \ + target=`echo "$$name" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \ + rm -f $$target ; \ + done diff --git a/utilities/magick-script.1 b/utilities/magick-script.1 new file mode 100644 index 000000000..efc2541f2 --- /dev/null +++ b/utilities/magick-script.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-script.1.in b/utilities/magick-script.1.in new file mode 100644 index 000000000..38d9b592e --- /dev/null +++ b/utilities/magick-script.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 -- 2.40.0