From 6ee2f8de70b8bb2b82b399fa970d3e17f7c65a25 Mon Sep 17 00:00:00 2001 From: cristy Date: Wed, 27 Feb 2013 01:59:11 +0000 Subject: [PATCH] --- MagickCore/magick-baseconfig.h | 2 +- MagickCore/version.h | 4 ++-- PerlMagick/Magick.pm | 2 +- PerlMagick/quantum/quantum.pm | 2 +- configure | 2 +- utilities/ImageMagick.1 | 4 ++-- utilities/animate.1 | 4 ++-- utilities/compare.1 | 4 ++-- utilities/composite.1 | 4 ++-- utilities/conjure.1 | 4 ++-- utilities/convert.1 | 4 ++-- utilities/display.1 | 4 ++-- utilities/identify.1 | 4 ++-- utilities/import.1 | 4 ++-- utilities/mogrify.1 | 4 ++-- utilities/montage.1 | 4 ++-- utilities/stream.1 | 4 ++-- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index 447855539..8eb99719a 100644 --- a/MagickCore/magick-baseconfig.h +++ b/MagickCore/magick-baseconfig.h @@ -51,7 +51,7 @@ /* Directory where ImageMagick documents live. */ #ifndef MAGICKCORE_DOCUMENTATION_PATH -#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-7.0.0/" +#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-7.0/" #endif /* Define if you have Display Postscript */ diff --git a/MagickCore/version.h b/MagickCore/version.h index c06725890..5f3cecca7 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2013 ImageMagick Studio LLC" -#define MagickSVNRevision "11115:11194" +#define MagickSVNRevision "11115:11200" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 @@ -39,7 +39,7 @@ extern "C" { #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.0.0/index.html" +#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-7.0/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" #define MagickQuantumRange "255" diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm index 72c3c1079..3f917417f 100644 --- a/PerlMagick/Magick.pm +++ b/PerlMagick/Magick.pm @@ -48,7 +48,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.0.0/www/perl-magick.html + file:///usr/local/share/doc/ImageMagick-7.0/www/perl-magick.html http://www.imagemagick.org/script/perl-magick.php If you have problems, go to diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm index 509c74ea5..a5be389c6 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.0.0/www/perl-magick.html + file:///usr/local/share/doc/ImageMagick-7.0/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 7a494b491..533fc6db6 100755 --- a/configure +++ b/configure @@ -3671,7 +3671,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=11115:11198M +MAGICK_SVN_REVISION=11115:11200 # Substitute library versioning diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1 index abf320ff1..e37e9f610 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.0.0/index.html or http://www.imagemagick.org/. +For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-7.0/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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/animate.1 b/utilities/animate.1 index 553a9c780..49005f1ba 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.0.0/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.0/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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/compare.1 b/utilities/compare.1 index 61935e44a..026b20109 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.0.0/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.0/www/compare.html or http://www.imagemagick.org/script/compare.php. .SH DESCRIPTION Image Settings: \-authenticate value decrypt image with this password @@ -66,4 +66,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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/composite.1 b/utilities/composite.1 index 1ef1e27ab..6459c5e64 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.0.0/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.0/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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/conjure.1 b/utilities/conjure.1 index d7cf7a2cc..750844087 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.0.0/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.0/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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/convert.1 b/utilities/convert.1 index ff3fcb5c1..2daf790c1 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.0.0/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.0/www/convert.html or http://www.imagemagick.org/script/convert.php. .SH DESCRIPTION Image Settings: \-adjoin join images into a single multi-image file @@ -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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/display.1 b/utilities/display.1 index d53ed4bc4..baf018e5d 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.0.0/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.0/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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/identify.1 b/utilities/identify.1 index dfe2e087a..a67ad73f2 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:///usr/local/share/doc/ImageMagick-7.0.0/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.0/www/identify.html or http://www.imagemagick.org/script/identify.php. .SH DESCRIPTION Image Settings: \-antialias remove pixel-aliasing @@ -65,4 +65,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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/import.1 b/utilities/import.1 index 1b8c56754..f2f331ac6 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.0.0/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.0/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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/mogrify.1 b/utilities/mogrify.1 index e0cf16dd3..57d2e66e5 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.0.0/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.0/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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/montage.1 b/utilities/montage.1 index 3e9a955a1..86facad16 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.0.0/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.0/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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP diff --git a/utilities/stream.1 b/utilities/stream.1 index c41b2b8ce..1045b530b 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.0.0/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.0/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.0.0/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/local/share/doc/ImageMagick-7.0/www/license.html or http://www.imagemagick.org/script/license.php\fP -- 2.50.1