From 1e61810417db04c4c5ea5975f6b85bf063da645f Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 17 Mar 2013 14:52:31 +0000 Subject: [PATCH] --- MagickCore/magick-baseconfig.h | 14 +++++++------- MagickCore/version.h | 4 ++-- MagickWand/convert.c | 6 +++--- MagickWand/identify.c | 23 ++++++++++++++++++++++- PerlMagick/quantum/Makefile.PL | 6 +++--- PerlMagick/quantum/quantum.pm | 2 +- utilities/ImageMagick.1 | 4 ++-- utilities/animate.1 | 4 ++-- utilities/compare.1 | 4 ++-- utilities/composite.1 | 4 ++-- utilities/conjure.1 | 4 ++-- utilities/convert.1 | 10 +++++----- utilities/convert.1.in | 6 +++--- utilities/display.1 | 4 ++-- utilities/identify.1 | 7 +++++-- utilities/identify.1.in | 3 +++ utilities/import.1 | 4 ++-- utilities/mogrify.1 | 4 ++-- utilities/montage.1 | 4 ++-- utilities/stream.1 | 4 ++-- 20 files changed, 74 insertions(+), 47 deletions(-) diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index 84102538a..5a216221e 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -37,7 +37,7 @@ /* Directory where architecture-dependent configuration files live. */ #ifndef MAGICKCORE_CONFIGURE_PATH -#define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick-7/" +#define MAGICKCORE_CONFIGURE_PATH "/usr/etc/ImageMagick-7/" #endif /* Subdirectory of lib where architecture-dependent configuration files live. @@ -51,7 +51,7 @@ /* Directory where ImageMagick documents live. */ #ifndef MAGICKCORE_DOCUMENTATION_PATH -#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-7/" +#define MAGICKCORE_DOCUMENTATION_PATH "/usr/share/doc/ImageMagick-7/" #endif /* Define if you have Display Postscript */ @@ -62,7 +62,7 @@ /* Directory where executables are installed. */ #ifndef MAGICKCORE_EXECUTABLE_PATH -#define MAGICKCORE_EXECUTABLE_PATH "/usr/local/bin/" +#define MAGICKCORE_EXECUTABLE_PATH "/usr/bin/" #endif /* Define if you have FFTW library */ @@ -1082,12 +1082,12 @@ /* Directory where ImageMagick architecture headers live. */ #ifndef MAGICKCORE_INCLUDEARCH_PATH -#define MAGICKCORE_INCLUDEARCH_PATH "/usr/local/include/ImageMagick-7/" +#define MAGICKCORE_INCLUDEARCH_PATH "/usr/include/ImageMagick-7/" #endif /* Directory where ImageMagick headers live. */ #ifndef MAGICKCORE_INCLUDE_PATH -#define MAGICKCORE_INCLUDE_PATH "/usr/local/include/ImageMagick-7/" +#define MAGICKCORE_INCLUDE_PATH "/usr/include/ImageMagick-7/" #endif /* ImageMagick is formally installed under prefix */ @@ -1115,7 +1115,7 @@ /* Directory where architecture-dependent files live. */ #ifndef MAGICKCORE_LIBRARY_PATH -#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.0/" +#define MAGICKCORE_LIBRARY_PATH "/usr/lib/ImageMagick-7.0.0/" #endif /* Subdirectory of lib where ImageMagick architecture dependent files are @@ -1280,7 +1280,7 @@ /* Directory where architecture-independent configuration files live. */ #ifndef MAGICKCORE_SHARE_PATH -#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-7/" +#define MAGICKCORE_SHARE_PATH "/usr/share/ImageMagick-7/" #endif /* Subdirectory of lib where architecture-independent configuration files diff --git a/MagickCore/version.h b/MagickCore/version.h index 0216170f9..e493da382 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -34,12 +34,12 @@ extern "C" { #define MagickLibAddendum "-0" #define MagickLibInterface 1 #define MagickLibMinInterface 1 -#define MagickReleaseDate "2013-03-16" +#define MagickReleaseDate "2013-03-17" #define MagickChangeDate "20121005" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" #define MagickDelegates "bzlib fontconfig freetype jng jp2 jpeg lcms lzma pango png ps tiff x xml zlib" -#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-7/index.html" +#define MagickHomeURL "file:///usr/share/doc/ImageMagick-7/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" #define MagickQuantumRange "255" diff --git a/MagickWand/convert.c b/MagickWand/convert.c index 0b498f5ce..a90593935 100644 --- a/MagickWand/convert.c +++ b/MagickWand/convert.c @@ -181,9 +181,6 @@ static MagickBooleanType ConvertUsage(void) "-charcoal radius simulate a charcoal drawing", "-chop geometry remove pixels from the image interior", "-clamp keep pixel values in range (0-QuantumRange)", - "-clip clip along the first path from the 8BIM profile", - "-clip-mask filename associate a clip mask with the image", - "-clip-path id clip along a named path from the 8BIM profile", "-colorize value colorize the image with the fill color", "-color-matrix matrix apply color correction to the image", "-contrast enhance or reduce the image contrast", @@ -354,6 +351,9 @@ static MagickBooleanType ConvertUsage(void) "-bordercolor color border color", "-caption string assign a caption to an image", "-channel type apply option to select image channels", + "-clip clip along the first path from the 8BIM profile", + "-clip-mask filename associate a clip mask with the image", + "-clip-path id clip along a named path from the 8BIM profile", "-colors value preferred number of colors in the image", "-colorspace type alternate image colorspace", "-comment string annotate image with comment", diff --git a/MagickWand/identify.c b/MagickWand/identify.c index 16727ee34..bd9205325 100644 --- a/MagickWand/identify.c +++ b/MagickWand/identify.c @@ -118,6 +118,9 @@ static MagickBooleanType IdentifyUsage(void) "-authenticate password", " decipher image with this password", "-channel type apply option to select image channels", + "-clip clip along the first path from the 8BIM profile", + "-clip-mask filename associate a clip mask with the image", + "-clip-path id clip along a named path from the 8BIM profile", "-colorspace type alternate image colorspace", "-crop geometry cut out a rectangular region of the image", "-define format:option", @@ -410,6 +413,24 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, argv[i]); break; } + if (LocaleCompare("clip",option+1) == 0) + break; + if (LocaleCompare("clip-mask",option+1) == 0) + { + if (*option == '+') + break; + i++; + if (i == (ssize_t) (argc-1)) + ThrowIdentifyException(OptionError,"MissingArgument",option); + break; + } + if (LocaleCompare("clip-path",option+1) == 0) + { + i++; + if (i == (ssize_t) (argc-1)) + ThrowIdentifyException(OptionError,"MissingArgument",option); + break; + } if (LocaleCompare("colorspace",option+1) == 0) { ssize_t @@ -514,7 +535,7 @@ WandExport MagickBooleanType IdentifyImageCommand(ImageInfo *image_info, } ThrowIdentifyException(OptionError,"UnrecognizedOption",option) } - case '3': + case 'e': { if (LocaleCompare("endian",option+1) == 0) { diff --git a/PerlMagick/quantum/Makefile.PL b/PerlMagick/quantum/Makefile.PL index 1bec80b82..f78378859 100644 --- a/PerlMagick/quantum/Makefile.PL +++ b/PerlMagick/quantum/Makefile.PL @@ -221,7 +221,7 @@ WriteMakefile 'LDDLFLAGS' => $LDDLFLAGS_magick, # Install PerlMagick binary into ImageMagick bin directory - 'INSTALLBIN' => '/usr/local/bin', + 'INSTALLBIN' => '/usr/bin', # Library specification 'LIBS' => [ $LIBS_magick ], @@ -240,7 +240,7 @@ WriteMakefile 'LD' => '', # Set Perl installation prefix to ImageMagick installation prefix -# 'PREFIX' => '/usr/local', +# 'PREFIX' => '/usr', # Include delegate directories in tests test => { TESTS => $delegate_tests}, @@ -265,6 +265,6 @@ sub MY::makeaperl { # tries to insert our library path first. Also, use the same compiler used # to build perlmain.c to link so that a C++ compiler may be used if # necessary. - $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD = \$(PERLMAINCC) -L/usr/local/lib: ; + $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD = \$(PERLMAINCC) -L/usr/lib: ; $inherited; } diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm index 071fd1d2e..6df5cc5f3 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:///usr/local/share/doc/ImageMagick-7/www/perl-magick.html + file:///usr/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/utilities/ImageMagick.1 b/utilities/ImageMagick.1 index 7e4cf073a..05f946e94 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:///usr/local/share/doc/ImageMagick-7/index.html or http://www.imagemagick.org/. +For more information about the ImageMagick, point your browser to file:///usr/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-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/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 4800181c7..a5be96990 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:///usr/local/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/share/doc/ImageMagick-7/www/animate.html or http://www.imagemagick.org/script/animate.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -93,4 +93,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/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 4bbede1e1..10687f313 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:///usr/local/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/share/doc/ImageMagick-7/www/compare.html or http://www.imagemagick.org/script/compare.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -70,4 +70,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/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 254722c00..68bbbe9e2 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:///usr/local/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/share/doc/ImageMagick-7/www/composite.html or http://www.imagemagick.org/script/composite.php. .SH DESCRIPTION Image Settings: \-affine matrix affine transform matrix @@ -103,4 +103,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/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 d1fa0c63f..1c5064dea 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:///usr/local/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/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-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/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 6eb0d6a64..bac169b9d 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:///usr/local/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/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 @@ -23,6 +23,9 @@ Image Settings: \-caption string assign a caption to an image \-cdl filename color correct with a color decision list \-channel type apply option to select image channels + \-clip clip along the first path from the 8BIM profile + \-clip-mask filename associate a clip mask with the image + \-clip-path id clip along a named path from the 8BIM profile \-colors value preferred number of colors in the image \-colorspace type alternate image colorspace \-comment string annotate image with comment @@ -118,9 +121,6 @@ Image Operators: \-charcoal radius simulate a charcoal drawing \-chop geometry remove pixels from the image interior \-clamp keep pixel values in range (0-QuantumRange) - \-clip clip along the first path from the 8BIM profile - \-clip-mask filename associate a clip mask with the image - \-clip-path id clip along a named path from the 8BIM profile \-colorize value colorize the image with the fill color \-color-matrix matrix apply color correction to the image \-contrast enhance or reduce the image contrast @@ -282,4 +282,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/convert.1.in b/utilities/convert.1.in index 138ce14a0..831964a23 100644 --- a/utilities/convert.1.in +++ b/utilities/convert.1.in @@ -23,6 +23,9 @@ Image Settings: \-caption string assign a caption to an image \-cdl filename color correct with a color decision list \-channel type apply option to select image channels + \-clip clip along the first path from the 8BIM profile + \-clip-mask filename associate a clip mask with the image + \-clip-path id clip along a named path from the 8BIM profile \-colors value preferred number of colors in the image \-colorspace type alternate image colorspace \-comment string annotate image with comment @@ -118,9 +121,6 @@ Image Operators: \-charcoal radius simulate a charcoal drawing \-chop geometry remove pixels from the image interior \-clamp keep pixel values in range (0-QuantumRange) - \-clip clip along the first path from the 8BIM profile - \-clip-mask filename associate a clip mask with the image - \-clip-path id clip along a named path from the 8BIM profile \-colorize value colorize the image with the fill color \-color-matrix matrix apply color correction to the image \-contrast enhance or reduce the image contrast diff --git a/utilities/display.1 b/utilities/display.1 index 9c2f239d4..f44c0216c 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:///usr/local/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/share/doc/ImageMagick-7/www/display.html or http://www.imagemagick.org/script/display.php. .SH DESCRIPTION Image Settings: \-antialias remove pixel-aliasing @@ -129,4 +129,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/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 17c13133b..8abe29006 100644 --- a/utilities/identify.1 +++ b/utilities/identify.1 @@ -7,12 +7,15 @@ 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:///usr/local/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/share/doc/ImageMagick-7/www/identify.html or http://www.imagemagick.org/script/identify.php. .SH DESCRIPTION Image Settings: \-antialias remove pixel-aliasing \-authenticate value decrypt image with this password \-channel type apply option to select image channels + \-clip clip along the first path from the 8BIM profile + \-clip-mask filename associate a clip mask with the image + \-clip-path id clip along a named path from the 8BIM profile \-crop geometry cut out a rectangular region of the image \-define format:option define one or more image format options @@ -65,4 +68,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/identify.1.in b/utilities/identify.1.in index 9584813bc..b635cdfac 100644 --- a/utilities/identify.1.in +++ b/utilities/identify.1.in @@ -13,6 +13,9 @@ Image Settings: \-antialias remove pixel-aliasing \-authenticate value decrypt image with this password \-channel type apply option to select image channels + \-clip clip along the first path from the 8BIM profile + \-clip-mask filename associate a clip mask with the image + \-clip-path id clip along a named path from the 8BIM profile \-crop geometry cut out a rectangular region of the image \-define format:option define one or more image format options diff --git a/utilities/import.1 b/utilities/import.1 index 5e27f5f43..11426cae0 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:///usr/local/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/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 @@ -94,4 +94,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/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 fe314c2c5..4b7678dda 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:///usr/local/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/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 @@ -281,4 +281,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/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 d85a08950..1bc7ce1f5 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:///usr/local/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/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 @@ -131,4 +131,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/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 b99d7f487..3b8bc2a4b 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:///usr/local/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/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 @@ -54,4 +54,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2013 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 +\fBCopyright (C) 1999-2013 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP -- 2.50.1