]> granicus.if.org Git - imagemagick/commitdiff
https://www.imagemagick.org/discourse-server/viewtopic.php?f=2&t=29366
authorCristy <urban-warrior@imagemagick.org>
Thu, 31 Mar 2016 20:09:35 +0000 (16:09 -0400)
committerCristy <urban-warrior@imagemagick.org>
Thu, 31 Mar 2016 20:09:35 +0000 (16:09 -0400)
16 files changed:
MagickCore/geometry.c
Makefile.in
configure
utilities/Makefile.am
utilities/animate.c [deleted file]
utilities/compare.c [deleted file]
utilities/composite.c [deleted file]
utilities/conjure.c [deleted file]
utilities/convert.c [deleted file]
utilities/display.c [deleted file]
utilities/identify.c [deleted file]
utilities/import.c [deleted file]
utilities/magick.c
utilities/mogrify.c [deleted file]
utilities/montage.c [deleted file]
utilities/stream.c [deleted file]

index 1898f2f3f1c0e448ab602da37024279c6dea76d0..45bd12797768d4e9d8d0fcf2a825947851255394 100644 (file)
@@ -451,7 +451,7 @@ MagickExport char *GetPageGeometry(const char *page_geometry)
   assert(page_geometry != (char *) NULL);
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",page_geometry);
   CopyMagickMemory(page,page_geometry,MaxTextExtent);
-  for (i=0; i < sizeof(PageSizes)/sizeof(PageSizes[0]); i++)
+  for (i=0; i < (sizeof(PageSizes)/sizeof(PageSizes[0])); i++)
   {
     int
       status;
index 96ee7dd011d8f0bd161405227acb3fec50156881..870c43876e50e9fd43b6f3075ec90d00e6e9ae7e 100644 (file)
@@ -1790,12 +1790,7 @@ filters_analyze_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_CFLAGS) $(CFLAGS) $(filters_analyze_la_LDFLAGS) \
        $(LDFLAGS) -o $@
 @WITH_MODULES_TRUE@am_filters_analyze_la_rpath = -rpath $(filtersdir)
-am__EXEEXT_1 = utilities/animate$(EXEEXT) utilities/compare$(EXEEXT) \
-       utilities/composite$(EXEEXT) utilities/conjure$(EXEEXT) \
-       utilities/display$(EXEEXT) utilities/identify$(EXEEXT) \
-       utilities/import$(EXEEXT) utilities/magick$(EXEEXT) \
-       utilities/mogrify$(EXEEXT) utilities/montage$(EXEEXT) \
-       utilities/stream$(EXEEXT)
+am__EXEEXT_1 = utilities/magick$(EXEEXT)
 am__EXEEXT_2 = tests/validate$(EXEEXT) tests/drawtest$(EXEEXT) \
        tests/wandtest$(EXEEXT)
 am__EXEEXT_3 = Magick++/demo/analyze$(EXEEXT) \
@@ -1936,57 +1931,6 @@ tests_wandtest_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
        $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
        $(AM_CFLAGS) $(CFLAGS) $(tests_wandtest_LDFLAGS) $(LDFLAGS) -o \
        $@
-am_utilities_animate_OBJECTS = utilities/animate.$(OBJEXT)
-utilities_animate_OBJECTS = $(am_utilities_animate_OBJECTS)
-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_OBJECTS = utilities/compare.$(OBJEXT)
-utilities_compare_OBJECTS = $(am_utilities_compare_OBJECTS)
-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_OBJECTS = utilities/composite.$(OBJEXT)
-utilities_composite_OBJECTS = $(am_utilities_composite_OBJECTS)
-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_OBJECTS = utilities/conjure.$(OBJEXT)
-utilities_conjure_OBJECTS = $(am_utilities_conjure_OBJECTS)
-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_display_OBJECTS = utilities/display.$(OBJEXT)
-utilities_display_OBJECTS = $(am_utilities_display_OBJECTS)
-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_OBJECTS = utilities/identify.$(OBJEXT)
-utilities_identify_OBJECTS = $(am_utilities_identify_OBJECTS)
-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_OBJECTS = utilities/import.$(OBJEXT)
-utilities_import_OBJECTS = $(am_utilities_import_OBJECTS)
-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_OBJECTS = utilities/magick.$(OBJEXT)
 utilities_magick_OBJECTS = $(am_utilities_magick_OBJECTS)
 utilities_magick_DEPENDENCIES = $(MAGICKCORE_LIBS) $(MAGICKWAND_LIBS)
@@ -1994,27 +1938,6 @@ 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)
-utilities_mogrify_OBJECTS = $(am_utilities_mogrify_OBJECTS)
-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_OBJECTS = utilities/montage.$(OBJEXT)
-utilities_montage_OBJECTS = $(am_utilities_montage_OBJECTS)
-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_OBJECTS = utilities/stream.$(OBJEXT)
-utilities_stream_OBJECTS = $(am_utilities_stream_OBJECTS)
-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) \
-       -o $@
 SCRIPTS = $(bin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -2154,12 +2077,7 @@ SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_
        $(Magick___tests_readWriteBlob_SOURCES) \
        $(Magick___tests_readWriteImages_SOURCES) \
        $(tests_drawtest_SOURCES) $(tests_validate_SOURCES) \
-       $(tests_wandtest_SOURCES) $(utilities_animate_SOURCES) \
-       $(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \
-       $(utilities_conjure_SOURCES) $(utilities_display_SOURCES) \
-       $(utilities_identify_SOURCES) $(utilities_import_SOURCES) \
-       $(utilities_magick_SOURCES) $(utilities_mogrify_SOURCES) \
-       $(utilities_montage_SOURCES) $(utilities_stream_SOURCES)
+       $(tests_wandtest_SOURCES) $(utilities_magick_SOURCES)
 DIST_SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES) \
        $(am__MagickCore_libMagickCore_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES_DIST) \
        $(MagickWand_libMagickWand_@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES) \
@@ -2246,12 +2164,7 @@ DIST_SOURCES = $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUF
        $(Magick___tests_readWriteBlob_SOURCES) \
        $(Magick___tests_readWriteImages_SOURCES) \
        $(tests_drawtest_SOURCES) $(tests_validate_SOURCES) \
-       $(tests_wandtest_SOURCES) $(utilities_animate_SOURCES) \
-       $(utilities_compare_SOURCES) $(utilities_composite_SOURCES) \
-       $(utilities_conjure_SOURCES) $(utilities_display_SOURCES) \
-       $(utilities_identify_SOURCES) $(utilities_import_SOURCES) \
-       $(utilities_magick_SOURCES) $(utilities_mogrify_SOURCES) \
-       $(utilities_montage_SOURCES) $(utilities_stream_SOURCES)
+       $(tests_wandtest_SOURCES) $(utilities_magick_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -5004,55 +4917,15 @@ filters_analyze_la_CPPFLAGS = $(MAGICK_FILTER_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/display \
-       utilities/identify \
-       utilities/import \
-       utilities/magick \
-       utilities/mogrify \
-       utilities/montage \
-       utilities/stream
+       utilities/magick 
 
 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_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 \
@@ -5090,7 +4963,7 @@ UTILITIES_EXTRA_DIST = \
 UTILITIES_CLEANFILES = 
 
 # Link these utilities to 'magick'.
-MAGICK_UTILITIES = convert magick-script
+MAGICK_UTILITIES = animate compare composite conjure display identify import magick-script mogrify montage stream
 UTILITIES_INSTALL_EXEC_LOCAL_TARGETS = install-exec-local-utilities
 UTILITIES_UNINSTALL_LOCAL_TARGETS = uninstall-local-utilities
 
@@ -7075,72 +6948,12 @@ utilities/$(am__dirstamp):
 utilities/$(DEPDIR)/$(am__dirstamp):
        @$(MKDIR_P) utilities/$(DEPDIR)
        @: > utilities/$(DEPDIR)/$(am__dirstamp)
-utilities/animate.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/animate$(EXEEXT): $(utilities_animate_OBJECTS) $(utilities_animate_DEPENDENCIES) $(EXTRA_utilities_animate_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/animate$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_animate_LINK) $(utilities_animate_OBJECTS) $(utilities_animate_LDADD) $(LIBS)
-utilities/compare.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/compare$(EXEEXT): $(utilities_compare_OBJECTS) $(utilities_compare_DEPENDENCIES) $(EXTRA_utilities_compare_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/compare$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_compare_LINK) $(utilities_compare_OBJECTS) $(utilities_compare_LDADD) $(LIBS)
-utilities/composite.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/composite$(EXEEXT): $(utilities_composite_OBJECTS) $(utilities_composite_DEPENDENCIES) $(EXTRA_utilities_composite_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/composite$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_composite_LINK) $(utilities_composite_OBJECTS) $(utilities_composite_LDADD) $(LIBS)
-utilities/conjure.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/conjure$(EXEEXT): $(utilities_conjure_OBJECTS) $(utilities_conjure_DEPENDENCIES) $(EXTRA_utilities_conjure_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/conjure$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_conjure_LINK) $(utilities_conjure_OBJECTS) $(utilities_conjure_LDADD) $(LIBS)
-utilities/display.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/display$(EXEEXT): $(utilities_display_OBJECTS) $(utilities_display_DEPENDENCIES) $(EXTRA_utilities_display_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/display$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_display_LINK) $(utilities_display_OBJECTS) $(utilities_display_LDADD) $(LIBS)
-utilities/identify.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/identify$(EXEEXT): $(utilities_identify_OBJECTS) $(utilities_identify_DEPENDENCIES) $(EXTRA_utilities_identify_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/identify$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_identify_LINK) $(utilities_identify_OBJECTS) $(utilities_identify_LDADD) $(LIBS)
-utilities/import.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/import$(EXEEXT): $(utilities_import_OBJECTS) $(utilities_import_DEPENDENCIES) $(EXTRA_utilities_import_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/import$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_import_LINK) $(utilities_import_OBJECTS) $(utilities_import_LDADD) $(LIBS)
 utilities/magick.$(OBJEXT): utilities/$(am__dirstamp) \
        utilities/$(DEPDIR)/$(am__dirstamp)
 
 utilities/magick$(EXEEXT): $(utilities_magick_OBJECTS) $(utilities_magick_DEPENDENCIES) $(EXTRA_utilities_magick_DEPENDENCIES) utilities/$(am__dirstamp)
        @rm -f utilities/magick$(EXEEXT)
        $(AM_V_CCLD)$(utilities_magick_LINK) $(utilities_magick_OBJECTS) $(utilities_magick_LDADD) $(LIBS)
-utilities/mogrify.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/mogrify$(EXEEXT): $(utilities_mogrify_OBJECTS) $(utilities_mogrify_DEPENDENCIES) $(EXTRA_utilities_mogrify_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/mogrify$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_mogrify_LINK) $(utilities_mogrify_OBJECTS) $(utilities_mogrify_LDADD) $(LIBS)
-utilities/montage.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/montage$(EXEEXT): $(utilities_montage_OBJECTS) $(utilities_montage_DEPENDENCIES) $(EXTRA_utilities_montage_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/montage$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_montage_LINK) $(utilities_montage_OBJECTS) $(utilities_montage_LDADD) $(LIBS)
-utilities/stream.$(OBJEXT): utilities/$(am__dirstamp) \
-       utilities/$(DEPDIR)/$(am__dirstamp)
-
-utilities/stream$(EXEEXT): $(utilities_stream_OBJECTS) $(utilities_stream_DEPENDENCIES) $(EXTRA_utilities_stream_DEPENDENCIES) utilities/$(am__dirstamp)
-       @rm -f utilities/stream$(EXEEXT)
-       $(AM_V_CCLD)$(utilities_stream_LINK) $(utilities_stream_OBJECTS) $(utilities_stream_LDADD) $(LIBS)
 install-binSCRIPTS: $(bin_SCRIPTS)
        @$(NORMAL_INSTALL)
        @list='$(bin_SCRIPTS)'; test -n "$(bindir)" || list=; \
@@ -7611,17 +7424,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/tests_drawtest-drawtest.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/tests_validate-validate.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@tests/$(DEPDIR)/tests_wandtest-wandtest.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/animate.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/compare.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/composite.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/conjure.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/display.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/identify.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/import.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/magick.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/mogrify.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/montage.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@utilities/$(DEPDIR)/stream.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
index 08860ba25eaca544fd6711c5e381ad083ec8f329..2ecf058e6a90f10dcf6dea6e237cd5415571a25a 100755 (executable)
--- a/configure
+++ b/configure
@@ -4523,7 +4523,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_GIT_REVISION=17931:5a34d7a:20160331
+MAGICK_GIT_REVISION=17933:9a527ef:20160331
 
 
 # Substitute library versioning
index 3bd7ba988575cf38d37c84dfdfbfcdeb6f03598a..2b9b1068f158da94aa4d0a3bd9e0c1787055e48a 100644 (file)
 #  Makefile for building ImageMagick utilities.
 
 UTILITIES_PGMS = \
-       utilities/animate \
-       utilities/compare \
-       utilities/composite \
-       utilities/conjure \
-       utilities/display \
-       utilities/identify \
-       utilities/import \
-       utilities/magick \
-       utilities/mogrify \
-       utilities/montage \
-       utilities/stream
+       utilities/magick 
 
 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_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 \
@@ -112,7 +62,7 @@ UTILITIES_EXTRA_DIST = \
 UTILITIES_CLEANFILES = 
 
 # Link these utilities to 'magick'.
-MAGICK_UTILITIES=convert magick-script
+MAGICK_UTILITIES=animate compare composite conjure display identify import magick-script mogrify montage stream
 UTILITIES_INSTALL_EXEC_LOCAL_TARGETS=install-exec-local-utilities
 install-exec-local-utilities:
        $(mkdir_p) $(DESTDIR)$(bindir)
diff --git a/utilities/animate.c b/utilities/animate.c
deleted file mode 100644 (file)
index 9ce4dbd..0000000
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%                AAA   N   N  IIIII  M   M   AAA   TTTTT  EEEEE               %
-%               A   A  NN  N    I    MM MM  A   A    T    E                   %
-%               AAAAA  N N N    I    M M M  AAAAA    T    EEE                 %
-%               A   A  N  NN    I    M   M  A   A    T    E                   %
-%               A   A  N   N  IIIII  M   M  A   A    T    EEEEE               %
-%                                                                             %
-%                                                                             %
-%                   Interactively Animate an Image Sequence.                  %
-%                                                                             %
-%                             Software Design                                 %
-%                                  Cristy                                     %
-%                                July 1992                                    %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Animate displays a sequence of images in the MIFF format on any
-%  workstation display running an X server.  Animate first determines the
-%  hardware capabilities of the workstation.  If the number of unique
-%  colors in an image is less than or equal to the number the workstation
-%  can support, the image is displayed in an X window.  Otherwise the
-%  number of colors in the image is first reduced to match the color
-%  resolution of the workstation before it is displayed.
-%
-%  This means that a continuous-tone 24 bits-per-pixel image can display on a
-%  8 bit pseudo-color device or monochrome device.  In most instances the
-%  reduced color image closely resembles the original.  Alternatively, a
-%  monochrome or pseudo-color image can display on a continuous-tone 24
-%  bits-per-pixel device.
-%
-%
-*/
-\f
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int AnimateMain(int argc,char **argv)
-{
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,AnimateImageCommand,argc,argv,
-    (char **) NULL,exception);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(AnimateMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=AnimateMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif
diff --git a/utilities/compare.c b/utilities/compare.c
deleted file mode 100644 (file)
index 15e0b40..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%               CCCC   OOO   M   M  PPPP    AAA   RRRR    EEEEE               %
-%              C      O   O  MM MM  P   P  A   A  R   R   E                   %
-%              C      O   O  M M M  PPPP   AAAAA  RRRR    EEE                 %
-%              C      O   O  M   M  P      A   A  R R     E                   %
-%               CCCC   OOO   M   M  P      A   A  R  R    EEEEE               %
-%                                                                             %
-%                                                                             %
-%                        Image Comparison Utility                             %
-%                                                                             %
-%                                                                             %
-%                           Software Design                                   %
-%                                Cristy                                       %
-%                            December 2003                                    %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-% The compare utility mathematically and visually annotates the difference
-% between an image and its reconstruction.
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-static int CompareMain(int argc,char **argv)
-{
-  char
-    *metadata;
-
-  const char
-    *option;
-
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    dissimilar,
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  metadata=(char *) NULL;
-  status=MagickCommandGenesis(image_info,CompareImagesCommand,argc,argv,
-    &metadata,exception);
-  if (metadata != (char *) NULL)
-    metadata=DestroyString(metadata);
-  option=GetImageOption(image_info,"compare:dissimilar");
-  dissimilar=IsStringTrue(option);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  if (dissimilar != MagickFalse)
-    return(1);
-  return(status != MagickFalse ? 0 : 2);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(CompareMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=CompareMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif
diff --git a/utilities/composite.c b/utilities/composite.c
deleted file mode 100644 (file)
index 762b6e9..0000000
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%         CCCC   OOO   M   M  PPPP    OOO   SSSSS  IIIII  TTTTT  EEEEE        %
-%        C      O   O  MM MM  P   P  O   O  SS       I      T    E            %
-%        C      O   O  M.M M  PPPP   O   O   SSS     I      T    EEE          %
-%        C      O   O  M   M  P      O   O     SS    I      T    E            %
-%         CCCC   OOO   M   M  P       OOO   SSSSS  IIIII    T    EEEEE        %
-%                                                                             %
-%                                                                             %
-%                        Digitally composite two images.                      %
-%                                                                             %
-%                              Software Design                                %
-%                                   Cristy                                    %
-%                               January 1993                                  %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Program Composite composites images to create new images.
-%
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int CompositeMain(int argc,char **argv)
-{
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,CompositeImageCommand,argc,argv,
-    (char **) NULL,exception);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(CompositeMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=CompositeMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif
diff --git a/utilities/conjure.c b/utilities/conjure.c
deleted file mode 100644 (file)
index 0483cb4..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%                CCCC   OOO   N   N  JJJJJ  U   U  RRRR   EEEEE               %
-%               C      O   O  NN  N    J    U   U  R   R  E                   %
-%               C      O   O  N N N    J    U   U  RRRR   EEE                 %
-%               C      O   O  N  NN  J J    U   U  R R    E                   %
-%                CCCC   OOO   N   N  JJJ     UUU   R  R   EEEEE               %
-%                                                                             %
-%                                                                             %
-%                     Interpret Magick Scripting Language.                    %
-%                                                                             %
-%                              Software Design                                %
-%                                   Cristy                                    %
-%                               December 2001                                 %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Conjure interprets and executes scripts in the Magick Scripting Language
-%  (MSL). The Magick scripting language (MSL) will primarily benefit those
-%  that want to accomplish custom image processing tasks but do not wish
-%  to program, or those that do not have access to a Perl interpreter or a
-%  compiler. The interpreter is called conjure and here is an example script:
-%
-%      <?xml version="1.0" encoding="UTF-8"?>
-%      <image size="400x400" >
-%      <read filename="image.gif" />
-%      <get width="base-width" height="base-height" />
-%      <resize geometry="%[dimensions]" />
-%      <get width="width" height="height" />
-%      <print output="Image sized from %[base-width]x%[base-height]
-%          to %[width]x%[height].\n" />
-%      <write filename="image.png" />
-%      </image>
-%
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int ConjureMain(int argc,char **argv)
-{
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,ConjureImageCommand,argc,argv,
-    (char **) NULL,exception);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(ConjureMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=ConjureMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif
diff --git a/utilities/convert.c b/utilities/convert.c
deleted file mode 100644 (file)
index 9583121..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%                CCCC   OOO   N   N  V   V  EEEEE  RRRR   TTTTT               %
-%               C      O   O  NN  N  V   V  E      R   R    T                 %
-%               C      O   O  N N N  V   V  EEE    RRRR     T                 %
-%               C      O   O  N  NN   V V   E      R R      T                 %
-%                CCCC   OOO   N   N    V    EEEEE  R  R     T                 %
-%                                                                             %
-%                                                                             %
-%                Convert an image from one format to another.                 %
-%                                                                             %
-%                              Software Design                                %
-%                                   Cristy                                    %
-%                                April 1992                                   %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Convert converts an input file using one image format to an output file
-%  with a differing image format. By default, the image format 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. If file has the extension .Z, the file is
-%  decoded with uncompress.
-%
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int ConvertMain(int argc,char **argv)
-{
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,ConvertImageCommand,argc,argv,
-    (char **) NULL,exception);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(ConvertMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=ConvertMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status != MagickFalse);
-}
-#endif
diff --git a/utilities/display.c b/utilities/display.c
deleted file mode 100644 (file)
index 0b658b1..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%               DDDD   IIIII  SSSSS  PPPP   L       AAA   Y   Y               %
-%               D   D    I    SS     P   P  L      A   A   Y Y                %
-%               D   D    I     SSS   PPPP   L      AAAAA    Y                 %
-%               D   D    I       SS  P      L      A   A    Y                 %
-%               DDDD   IIIII  SSSSS  P      LLLLL  A   A    Y                 %
-%                                                                             %
-%                                                                             %
-%                       Interactively Display an Image.                       %
-%                                                                             %
-%                             Software Design                                 %
-%                                  Cristy                                     %
-%                                July 1992                                    %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Display is a machine architecture independent image processing
-%  and display program.  It can display any image in the MIFF format on
-%  any workstation display running X.  Display first determines the
-%  hardware capabilities of the workstation.  If the number of unique
-%  colors in the image is less than or equal to the number the workstation
-%  can support, the image is displayed in an X window.  Otherwise the
-%  number of colors in the image is first reduced to match the color
-%  resolution of the workstation before it is displayed.
-%
-%  This means that a continuous-tone 24 bits-per-pixel image can display on a
-%  8 bit pseudo-color device or monochrome device.  In most instances the
-%  reduced color image closely resembles the original.  Alternatively, a
-%  monochrome or pseudo-color image can display on a continuous-tone 24
-%  bits-per-pixel device.
-%
-%
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int DisplayMain(int argc,char **argv)
-{
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,DisplayImageCommand,argc,argv,
-    (char **) NULL,exception);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(DisplayMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=DisplayMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif
diff --git a/utilities/identify.c b/utilities/identify.c
deleted file mode 100644 (file)
index 1a17462..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%           IIIII  DDDD   EEEEE  N   N  TTTTT  IIIII  FFFFF  Y   Y            %
-%             I    D   D  E      NN  N    T      I    F       Y Y             %
-%             I    D   D  EEE    N N N    T      I    FFF      Y              %
-%             I    D   D  E      N  NN    T      I    F        Y              %
-%           IIIII  DDDD   EEEEE  N   N    T    IIIII  F        Y              %
-%                                                                             %
-%                                                                             %
-%               Identify an Image Format and Characteristics.                 %
-%                                                                             %
-%                           Software Design                                   %
-%                                Cristy                                       %
-%                            September 1994                                   %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Identify describes the format and characteristics of one or more image
-%  files.  It will also report if an image is incomplete or corrupt.
-%
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int IdentifyMain(int argc,char **argv)
-{
-  char
-    *metadata;
-
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  metadata=(char *) NULL;
-  status=MagickCommandGenesis(image_info,IdentifyImageCommand,argc,argv,
-    &metadata,exception);
-  if (metadata != (char *) NULL)
-    metadata=DestroyString(metadata);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(IdentifyMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=IdentifyMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif
diff --git a/utilities/import.c b/utilities/import.c
deleted file mode 100644 (file)
index 1215014..0000000
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%                 IIIII  M   M  PPPP    OOO   RRRR   TTTTT                    %
-%                   I    MM MM  P   P  O   O  R   R    T                      %
-%                   I    M M M  PPPP   O   O  RRRR     T                      %
-%                   I    M   M  P      O   O  R R      T                      %
-%                 IIIII  M   M  P       OOO   R  R     T                      %
-%                                                                             %
-%                                                                             %
-%               Import image to a machine independent format.                 %
-%                                                                             %
-%                           Software Design                                   %
-%                                Cristy                                       %
-%                              July 1992                                      %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Import is an X Window System window dumping utility.  Import allows X
-%  users to store window images in a specially formatted dump file.  This
-%  file can then be read by the Display utility for redisplay, printing,
-%  editing, formatting, archiving, image processing, etc.  The target
-%  window can be specified by id or name or be selected by clicking the
-%  mouse in the desired window.  The keyboard bell is rung once at the
-%  beginning of the dump and twice when the dump is completed.
-%
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int ImportMain(int argc,char **argv)
-{
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,ImportImageCommand,argc,argv,
-    (char **) NULL,exception);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(ImportMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=ImportMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif
index eb6e6ae3002eacd7e2784b36069815e1295681c9..5b03e7519db20e2be6f50a3e70d514b35348b3ac 100644 (file)
@@ -9,6 +9,7 @@
 %                 M   M  A   A  G   G    I    C      K  K                     %
 %                 M   M  A   A   GGGG  IIIII   CCCC  K   K                    %
 %                                                                             %
+%                                                                             %
 %       Perform "Magick" on Images via the Command Line Interface             %
 %                                                                             %
 %                             Dragon Computing                                %
 
 static int MagickMain(int argc,char **argv)
 {
+#define MagickCommandSize(name,command) { (name), sizeof(name)-1, (command) }
+
+  typedef struct _CommandInfo
+  {
+    char
+      *name;
+
+    size_t
+      extent;
+
+    MagickCommand
+      command;
+  } CommandInfo;
+
+  static const CommandInfo
+    MagickCommands[] =
+    {
+      MagickCommandSize("magick", MagickImageCommand),  /* fallback command */
+      MagickCommandSize("animate", AnimateImageCommand),
+      MagickCommandSize("compare", CompareImagesCommand),
+      MagickCommandSize("conjure", ConjureImageCommand),
+      MagickCommandSize("convert", ConvertImageCommand),
+      MagickCommandSize("display", DisplayImageCommand),
+      MagickCommandSize("identify", IdentifyImageCommand),
+      MagickCommandSize("import", ImportImageCommand),
+      MagickCommandSize("magick-script", MagickImageCommand),
+      MagickCommandSize("mogrify", MogrifyImageCommand),
+      MagickCommandSize("montage", MontageImageCommand),
+      MagickCommandSize("stream", StreamImageCommand)
+    };
+
   ExceptionInfo
     *exception;
 
@@ -68,10 +100,24 @@ static int MagickMain(int argc,char **argv)
   MagickBooleanType
     status;
 
+  register ssize_t
+    i;
+
   MagickCoreGenesis(*argv,MagickTrue);
   exception=AcquireExceptionInfo();
   image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,MagickImageCommand,argc,argv,
+  for (i=0; i < (sizeof(MagickCommands)/sizeof(MagickCommands[0])); i++)
+  {
+    int
+      offset;
+
+    offset=LocaleNCompare(MagickCommands[i].name,argv[0],
+      MagickCommands[i].extent);
+    if (offset == 0)
+      break;
+  }
+  i%=(sizeof(MagickCommands)/sizeof(MagickCommands[0]));
+  status=MagickCommandGenesis(image_info,MagickCommands[i].command,argc,argv,
     (char **) NULL,exception);
   image_info=DestroyImageInfo(image_info);
   exception=DestroyExceptionInfo(exception);
diff --git a/utilities/mogrify.c b/utilities/mogrify.c
deleted file mode 100644 (file)
index 27e365e..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%              M   M   OOO    GGGG  RRRR   IIIII  FFFFF  Y   Y                %
-%              MM MM  O   O  G      R   R    I    F       Y Y                 %
-%              M M M  O   O  G GG   RRRRR    I    FFF      Y                  %
-%              M   M  O   O  G   G  R R      I    F        Y                  %
-%              M   M   OOO    GGG   R  R   IIIII  F        Y                  %
-%                                                                             %
-%                                                                             %
-%               Transmogrify an Image or Sequence of Images.                  %
-%                                                                             %
-%                           Software Design                                   %
-%                                Cristy                                       %
-%                            December 1992                                    %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Mogrify transforms an image or a sequence of images. These transforms
-%  include image scaling, image rotation, color reduction, and others. The
-%  transmogrified image overwrites the original image.
-%
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int MogrifyMain(int argc,char **argv)
-{
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,MogrifyImageCommand,argc,argv,
-    (char **) NULL,exception);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(MogrifyMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=MogrifyMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif
diff --git a/utilities/montage.c b/utilities/montage.c
deleted file mode 100644 (file)
index 217c618..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%              M   M   OOO   N   N  TTTTT   AAA    GGGG  EEEEE                %
-%              MM MM  O   O  NN  N    T    A   A  G      E                    %
-%              M M M  O   O  N N N    T    AAAAA  G  GG  EEE                  %
-%              M   M  O   O  N  NN    T    A   A  G   G  E                    %
-%              M   M   OOO   N   N    T    A   A   GGGG  EEEEE                %
-%                                                                             %
-%                                                                             %
-%              Montage Magick Image File Format Image via X11.                %
-%                                                                             %
-%                           Software Design                                   %
-%                                Cristy                                       %
-%                              July 1992                                      %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Montage creates a composite by combining several separate images. The
-%  images are tiled on the composite image with the name of the image
-%  optionally appearing just below the individual tile.
-%
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int MontageMain(int argc,char **argv)
-{
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,MontageImageCommand,argc,argv,
-    (char **) NULL,exception);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(MontageMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=MontageMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif
diff --git a/utilities/stream.c b/utilities/stream.c
deleted file mode 100644 (file)
index 13d2953..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%                 SSSSS  TTTTT  RRRR   EEEEE   AAA   M   M                    %
-%                 SS       T    R   R  E      A   A  MM MM                    %
-%                  SSS     T    RRRR   EEE    AAAAA  M M M                    %
-%                    SS    T    R R    E      A   A  M   M                    %
-%                 SSSSS    T    R  R   EEEEE  A   A  M   M                    %
-%                                                                             %
-%                                                                             %
-%                     Stream image to a raw image format.                     %
-%                                                                             %
-%                           Software Design                                   %
-%                                Cristy                                       %
-%                              July 1992                                      %
-%                                                                             %
-%                                                                             %
-%  Copyright 1999-2016 ImageMagick Studio LLC, a non-profit organization      %
-%  dedicated to making software imaging solutions freely available.           %
-%                                                                             %
-%  You may not use this file except in compliance with the License.  You may  %
-%  obtain a copy of the License at                                            %
-%                                                                             %
-%    http://www.imagemagick.org/script/license.php                            %
-%                                                                             %
-%  Unless required by applicable law or agreed to in writing, software        %
-%  distributed under the License is distributed on an "AS IS" BASIS,          %
-%  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   %
-%  See the License for the specific language governing permissions and        %
-%  limitations under the License.                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%  Stream is a lightweight utility designed to extract pixels from large image
-%  files to a raw format using a minimum of system resources.  The entire
-%  image or any regular portion of the image can be extracted.
-%
-%
-*/
-\f
-/*
-  Include declarations.
-*/
-#include "MagickWand/studio.h"
-#include "MagickWand/MagickWand.h"
-\f
-/*
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%  M a i n                                                                    %
-%                                                                             %
-%                                                                             %
-%                                                                             %
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%
-%
-*/
-
-static int StreamMain(int argc,char **argv)
-{
-  ExceptionInfo
-    *exception;
-
-  ImageInfo
-    *image_info;
-
-  MagickBooleanType
-    status;
-
-  MagickCoreGenesis(*argv,MagickTrue);
-  exception=AcquireExceptionInfo();
-  image_info=AcquireImageInfo();
-  status=MagickCommandGenesis(image_info,StreamImageCommand,argc,argv,
-    (char **) NULL,exception);
-  image_info=DestroyImageInfo(image_info);
-  exception=DestroyExceptionInfo(exception);
-  MagickCoreTerminus();
-  return(status != MagickFalse ? 0 : 1);
-}
-
-#if !defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__)
-int main(int argc,char **argv)
-{
-  return(StreamMain(argc,argv));
-}
-#else
-int wmain(int argc,wchar_t *argv[])
-{
-  char
-    **utf8;
-
-  int
-    status;
-
-  register int
-    i;
-
-  utf8=NTArgvToUTF8(argc,argv);
-  status=StreamMain(argc,utf8);
-  for (i=0; i < argc; i++)
-    utf8[i]=DestroyString(utf8[i]);
-  utf8=(char **) RelinquishMagickMemory(utf8);
-  return(status);
-}
-#endif