diff --git a/Makefile.in b/Makefile.in index 261803f7716..9f5d186e2f8 100644 --- a/Makefile.in +++ b/Makefile.in @@ -371,6 +371,7 @@ am_Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_OBJECT Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Options.lo \ Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Pixels.lo \ Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ResourceLimits.lo \ + Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.lo \ Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Statistic.lo \ Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-STL.lo \ Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Thread.lo \ @@ -2217,6 +2218,7 @@ am__magickppinc_HEADERS_DIST = Magick++/lib/Magick++/Blob.h \ Magick++/lib/Magick++/Include.h \ Magick++/lib/Magick++/Montage.h Magick++/lib/Magick++/Pixels.h \ Magick++/lib/Magick++/ResourceLimits.h \ + Magick++/lib/Magick++/SecurityPolicy.h \ Magick++/lib/Magick++/Statistic.h Magick++/lib/Magick++/STL.h \ Magick++/lib/Magick++/TypeMetric.h am__magickpptopinc_HEADERS_DIST = Magick++/lib/Magick++.h @@ -4811,6 +4813,7 @@ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = Magick++/lib/Options.cpp \ Magick++/lib/Pixels.cpp \ Magick++/lib/ResourceLimits.cpp \ + Magick++/lib/SecurityPolicy.cpp \ Magick++/lib/Statistic.cpp \ Magick++/lib/STL.cpp \ Magick++/lib/Thread.cpp \ @@ -4831,6 +4834,7 @@ Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_SOURCES = Magick++/lib/Magick++/Options.h \ Magick++/lib/Magick++/Pixels.h \ Magick++/lib/Magick++/ResourceLimits.h \ + Magick++/lib/Magick++/SecurityPolicy.h \ Magick++/lib/Magick++/Statistic.h \ Magick++/lib/Magick++/STL.h \ Magick++/lib/Magick++/Thread.h \ @@ -4859,6 +4863,7 @@ MAGICKPP_INCHEADERS_OPT = \ Magick++/lib/Magick++/Montage.h \ Magick++/lib/Magick++/Pixels.h \ Magick++/lib/Magick++/ResourceLimits.h \ + Magick++/lib/Magick++/SecurityPolicy.h \ Magick++/lib/Magick++/Statistic.h \ Magick++/lib/Magick++/STL.h \ Magick++/lib/Magick++/TypeMetric.h @@ -5484,6 +5489,9 @@ Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@ Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ResourceLimits.lo: \ Magick++/lib/$(am__dirstamp) \ Magick++/lib/$(DEPDIR)/$(am__dirstamp) +Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.lo: \ + Magick++/lib/$(am__dirstamp) \ + Magick++/lib/$(DEPDIR)/$(am__dirstamp) Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Statistic.lo: \ Magick++/lib/$(am__dirstamp) \ Magick++/lib/$(DEPDIR)/$(am__dirstamp) @@ -7127,6 +7135,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Pixels.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ResourceLimits.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-STL.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Statistic.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Thread.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-TypeMetric.Plo@am__quote@ @@ -10352,6 +10361,13 @@ Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@ @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-ResourceLimits.lo `test -f 'Magick++/lib/ResourceLimits.cpp' || echo '$(srcdir)/'`Magick++/lib/ResourceLimits.cpp +Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.lo: Magick++/lib/SecurityPolicy.cpp +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.lo -MD -MP -MF Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.Tpo -c -o Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.lo `test -f 'Magick++/lib/SecurityPolicy.cpp' || echo '$(srcdir)/'`Magick++/lib/SecurityPolicy.cpp +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.Tpo Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='Magick++/lib/SecurityPolicy.cpp' object='Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-SecurityPolicy.lo `test -f 'Magick++/lib/SecurityPolicy.cpp' || echo '$(srcdir)/'`Magick++/lib/SecurityPolicy.cpp + Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Statistic.lo: Magick++/lib/Statistic.cpp @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Statistic.lo -MD -MP -MF Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Statistic.Tpo -c -o Magick++/lib/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Statistic.lo `test -f 'Magick++/lib/Statistic.cpp' || echo '$(srcdir)/'`Magick++/lib/Statistic.cpp @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Statistic.Tpo Magick++/lib/$(DEPDIR)/Magick___lib_libMagick___@MAGICK_MAJOR_VERSION@_@MAGICK_ABI_SUFFIX@_la-Statistic.Plo diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm index f6383c7b3f8..f06fda33ae1 100644 --- a/PerlMagick/quantum/quantum.pm +++ b/PerlMagick/quantum/quantum.pm @@ -122,7 +122,7 @@ It was originally developed to be used by CGI scripts for Web pages. A web page has been set up for this extension. See: - file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/perl-magick.html + file:///usr/local/share/doc/ImageMagick-7/www/perl-magick.html http://www.imagemagick.org/script/perl-magick.php If you have problems, go to diff --git a/configure b/configure index 9c9482c8da3..36ec17d4435 100755 --- a/configure +++ b/configure @@ -4550,7 +4550,7 @@ MAGICK_PATCHLEVEL_VERSION=22 MAGICK_VERSION=7.0.7-22 -MAGICK_GIT_REVISION=22188:479ae8c25:20180107 +MAGICK_GIT_REVISION=22272:83874f9e4:20180114 # Substitute library versioning diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1 index b599667bc6a..8f0705c6fef 100644 --- a/utilities/ImageMagick.1 +++ b/utilities/ImageMagick.1 @@ -86,9 +86,9 @@ saves any visible window on an X server and outputs it as an image file. You can interprets and executes scripts written in the Magick Scripting Language (MSL). .PP -For more information about the ImageMagick, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/index.html or http://www.imagemagick.org/. +For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-7/index.html or http://www.imagemagick.org/. .SH SEE ALSO convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/animate.1 b/utilities/animate.1 index ea67b249244..4d88b184072 100644 --- a/utilities/animate.1 +++ b/utilities/animate.1 @@ -7,7 +7,7 @@ animate \- animates an image or image sequence on any X server. .SH OVERVIEW The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools. Use it to animate an image or image sequence on any X server. -For more information about the animate command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/animate.html or http://www.imagemagick.org/script/animate.php. +For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/animate.html or http://www.imagemagick.org/script/animate.php. .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -98,4 +98,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/compare.1 b/utilities/compare.1 index e43dbb0ad25..2f3165ec1be 100644 --- a/utilities/compare.1 +++ b/utilities/compare.1 @@ -7,7 +7,7 @@ compare \- mathematically and visually annotate the difference between an image .SH OVERVIEW The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools. Use it to mathematically and visually annotate the difference between an image and its reconstruction. -For more information about the compare command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/compare.html or http://www.imagemagick.org/script/compare.php. +For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/compare.html or http://www.imagemagick.org/script/compare.php. .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -104,4 +104,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/composite.1 b/utilities/composite.1 index d8576214d2a..2b090d7e0ee 100644 --- a/utilities/composite.1 +++ b/utilities/composite.1 @@ -7,7 +7,7 @@ composite \- overlaps one image over another. .SH OVERVIEW The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools. Use it to overlap one image over another. -For more information about the composite command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/composite.html or http://www.imagemagick.org/script/composite.php. +For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/composite.html or http://www.imagemagick.org/script/composite.php. .SH DESCRIPTION Image Settings: \-affine matrix affine transform matrix @@ -113,4 +113,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/conjure.1 b/utilities/conjure.1 index e228500f8ac..f02193ffe92 100644 --- a/utilities/conjure.1 +++ b/utilities/conjure.1 @@ -7,7 +7,7 @@ conjure \- interprets and executes scripts written in the Magick Scripting Langu .SH OVERVIEW The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools. Use it to process a Magick Scripting Language (MSL) script. 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. -For more information about the conjure command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/conjure.html or http://www.imagemagick.org/script/conjure.php. +For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/conjure.html or http://www.imagemagick.org/script/conjure.php. .SH DESCRIPTION Image Settings: \-monitor monitor progress @@ -31,4 +31,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/convert.1 b/utilities/convert.1 index 9eef524ec83..c6011cc3232 100644 --- a/utilities/convert.1 +++ b/utilities/convert.1 @@ -7,7 +7,7 @@ convert \- convert between image formats as well as resize an image, blur, crop, .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:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php. +For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/convert.html or http://www.imagemagick.org/script/convert.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -323,4 +323,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/display.1 b/utilities/display.1 index f7022f30414..883a124b411 100644 --- a/utilities/display.1 +++ b/utilities/display.1 @@ -7,7 +7,7 @@ display \- displays an image or image sequence on any X server. .SH OVERVIEW The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools. Use it to display an image or image sequence on any X server. -For more information about the display command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/display.html or http://www.imagemagick.org/script/display.php. +For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/display.html or http://www.imagemagick.org/script/display.php. .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -136,4 +136,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/identify.1 b/utilities/identify.1 index d1511bb437e..35fa448fac3 100644 --- a/utilities/identify.1 +++ b/utilities/identify.1 @@ -7,7 +7,7 @@ identify \- describes the format and characteristics of one or more image files. .SH OVERVIEW The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools. It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option. -For more information about the identify command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/identify.html or http://www.imagemagick.org/script/identify.php. +For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/identify.html or http://www.imagemagick.org/script/identify.php. .SH DESCRIPTION Image Settings: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -76,4 +76,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/import.1 b/utilities/import.1 index 4fead9e137b..e6f517d890f 100644 --- a/utilities/import.1 +++ b/utilities/import.1 @@ -7,7 +7,7 @@ import \- saves any visible window on an X server and outputs it as an image fil .SH OVERVIEW The \fBimport\fP program is a member of the ImageMagick(1) suite of tools. Use it to capture some or all of an X server screen and save the image to a file. -For more information about the import command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/import.html or http://www.imagemagick.org/script/import.php. +For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/import.html or http://www.imagemagick.org/script/import.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -97,4 +97,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/magick-script.1 b/utilities/magick-script.1 index 2c038c6458e..98c7b52c802 100644 --- a/utilities/magick-script.1 +++ b/utilities/magick-script.1 @@ -10,7 +10,7 @@ The \fBmagick-script\fP program is a member of the ImageMagick(1) suite of tools #!/bin/env magick-script -size 100x100 xc:red ( rose: -rotate -90 ) +append -write show: -For more information about the magick-script command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/magick-script.html or http://www.imagemagick.org/script/magick-script.php. +For more information about the magick-script command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/magick-script.html or http://www.imagemagick.org/script/magick-script.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -280,4 +280,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/magick.1 b/utilities/magick.1 index 1dd3b23c4ad..8442f129e04 100644 --- a/utilities/magick.1 +++ b/utilities/magick.1 @@ -7,7 +7,7 @@ magick \- convert between image formats as well as resize an image, blur, crop, .SH OVERVIEW The \fBmagickscript\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:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/magick.html or http://www.imagemagick.org/script/magick.php. +For more information about the magick command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/magick.html or http://www.imagemagick.org/script/magick.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -277,4 +277,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index 717e647a3ce..459279306d6 100644 --- a/utilities/mogrify.1 +++ b/utilities/mogrify.1 @@ -7,7 +7,7 @@ mogrify \- resize an image, blur, crop, despeckle, dither, draw on, flip, join, .SH OVERVIEW The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools. Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request. -For more information about the mogrify command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php. +For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -322,4 +322,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/montage.1 b/utilities/montage.1 index 8370048462e..1c3ad0f15b8 100644 --- a/utilities/montage.1 +++ b/utilities/montage.1 @@ -7,7 +7,7 @@ montage \- create a composite image by combining several separate images. The im .SH OVERVIEW The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools. Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more. -For more information about the montage command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/montage.html or http://www.imagemagick.org/script/montage.php. +For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/montage.html or http://www.imagemagick.org/script/montage.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -142,4 +142,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/stream.1 b/utilities/stream.1 index ac6c51b4e7d..6f396c4d30c 100644 --- a/utilities/stream.1 +++ b/utilities/stream.1 @@ -7,7 +7,7 @@ stream \- a lightweight tool to stream one or more pixel components of the image .SH OVERVIEW \fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats. It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components. -For more information about the stream command, point your browser to file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/stream.html or http://www.imagemagick.org/script/stream.php. +For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-7/www/stream.html or http://www.imagemagick.org/script/stream.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -56,4 +56,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///ImageMagick-7.0.7/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP +\fBCopyright (C) 1999-2018 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP