From: cristy Date: Tue, 16 Jul 2013 16:45:03 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~3501 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ee1bdaac725f5188c568ab27f07917156b98081c;p=imagemagick --- diff --git a/MagickCore/color.c b/MagickCore/color.c index 541f33cc5..d24af8c65 100644 --- a/MagickCore/color.c +++ b/MagickCore/color.c @@ -1523,7 +1523,7 @@ static MagickBooleanType InitializeColorList(ExceptionInfo *exception) } UnlockSemaphoreInfo(color_semaphore); } - return(IfMagickTrue(color_list != (LinkedListInfo *) NULL)); + return(color_list != (LinkedListInfo *) NULL ? MagickTrue : MagickFalse); } /* @@ -2113,7 +2113,7 @@ static MagickBooleanType LoadColorLists(const char *filename, (void) ThrowMagickException(exception,GetMagickModule(), ResourceLimitError,"MemoryAllocationFailed","`%s'",color_info->name); } - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } /* diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 0a3b11e32..d3712c6ce 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -152,7 +152,7 @@ MagickExport MagickBooleanType AutoGammaImage(Image *image, if( IfMagickFalse(status) ) break; } - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } /* @@ -2788,7 +2788,7 @@ MagickExport MagickBooleanType LevelImageColors(Image *image, (void) SetImageChannelMask(image,channel_mask); } } - return(status); + return(status != 0 ? MagickTrue : MagickFalse); } /* diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h index b6439efa5..01b4fb01f 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/etc/ImageMagick-7/" +#define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick-7/" #endif /* Subdirectory of lib where architecture-dependent configuration files live. @@ -53,7 +53,7 @@ /* Directory where ImageMagick documents live. */ #ifndef MAGICKCORE_DOCUMENTATION_PATH -#define MAGICKCORE_DOCUMENTATION_PATH "/usr/share/doc/ImageMagick-7/" +#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-7/" #endif /* Define if you have Display Postscript */ @@ -64,7 +64,7 @@ /* Directory where executables are installed. */ #ifndef MAGICKCORE_EXECUTABLE_PATH -#define MAGICKCORE_EXECUTABLE_PATH "/usr/bin/" +#define MAGICKCORE_EXECUTABLE_PATH "/usr/local/bin/" #endif /* Define if you have FFTW library */ @@ -467,9 +467,7 @@ #endif /* Define to 1 if you have a working `mmap' system call. */ -#ifndef MAGICKCORE_HAVE_MMAP_FILEIO -#define MAGICKCORE_HAVE_MMAP_FILEIO 1 -#endif +/* #undef HAVE_MMAP_FILEIO */ /* Define to 1 if you have the `munmap' function. */ #ifndef MAGICKCORE_HAVE_MUNMAP @@ -1050,9 +1048,7 @@ /* #undef HAVE__ALIGNED_MALLOC */ /* Define to 1 if the system has the type `_Bool'. */ -#ifndef MAGICKCORE_HAVE__BOOL -#define MAGICKCORE_HAVE__BOOL 1 -#endif +/* #undef HAVE__BOOL */ /* Define to 1 if you have the `_exit' function. */ #ifndef MAGICKCORE_HAVE__EXIT @@ -1089,12 +1085,12 @@ /* Directory where ImageMagick architecture headers live. */ #ifndef MAGICKCORE_INCLUDEARCH_PATH -#define MAGICKCORE_INCLUDEARCH_PATH "/usr/include/ImageMagick-7/" +#define MAGICKCORE_INCLUDEARCH_PATH "/usr/local/include/ImageMagick-7/" #endif /* Directory where ImageMagick headers live. */ #ifndef MAGICKCORE_INCLUDE_PATH -#define MAGICKCORE_INCLUDE_PATH "/usr/include/ImageMagick-7/" +#define MAGICKCORE_INCLUDE_PATH "/usr/local/include/ImageMagick-7/" #endif /* ImageMagick is formally installed under prefix */ @@ -1122,7 +1118,7 @@ /* Directory where architecture-dependent files live. */ #ifndef MAGICKCORE_LIBRARY_PATH -#define MAGICKCORE_LIBRARY_PATH "/usr/lib/ImageMagick-7.0.0/" +#define MAGICKCORE_LIBRARY_PATH "/usr/local/lib/ImageMagick-7.0.0/" #endif /* Subdirectory of lib where ImageMagick architecture dependent files are @@ -1289,7 +1285,7 @@ /* Directory where architecture-independent configuration files live. */ #ifndef MAGICKCORE_SHARE_PATH -#define MAGICKCORE_SHARE_PATH "/usr/share/ImageMagick-7/" +#define MAGICKCORE_SHARE_PATH "/usr/local/share/ImageMagick-7/" #endif /* Subdirectory of lib where architecture-independent configuration files diff --git a/MagickCore/memory.c b/MagickCore/memory.c index 1031a26cf..d24db8c3d 100644 --- a/MagickCore/memory.c +++ b/MagickCore/memory.c @@ -549,7 +549,7 @@ MagickExport MemoryInfo *AcquireVirtualMemory(const size_t count, if ((count == 0) || (quantum != (length/count))) { errno=ENOMEM; - return((void *) NULL); + return((MemoryInfo *) NULL); } memory_info=(MemoryInfo *) MagickAssumeAligned(AcquireAlignedMemory(1, sizeof(*memory_info))); diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index dc68435f2..2a2294d0a 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -3316,7 +3316,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, ssize_t v; - traits=GetPixelChannelTraits(image,i); + traits=GetPixelChannelTraits(image,(PixelChannel) i); if (traits == UndefinedPixelTrait) continue; if (((traits & CopyPixelTrait) != 0) || @@ -3477,7 +3477,7 @@ static ssize_t MorphologyPrimitiveDirect(Image *image, ssize_t v; - traits=GetPixelChannelTraits(image,i); + traits=GetPixelChannelTraits(image,(PixelChannel) i); if (traits == UndefinedPixelTrait) continue; if (((traits & CopyPixelTrait) != 0) || diff --git a/MagickCore/property.c b/MagickCore/property.c index 3f4c847bb..1eb9ebe2b 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -3275,7 +3275,7 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info, double value; - MagickBooleanType + MagickStatusType status; PixelInfo @@ -3288,23 +3288,23 @@ MagickExport char *InterpretImageProperties(ImageInfo *image_info, } GetPixelInfo(image,&pixel); fx_info=AcquireFxInfo(image,pattern+6,exception); - status=FxEvaluateChannelExpression(fx_info,RedPixelChannel, - 0,0,&value,exception); + status=FxEvaluateChannelExpression(fx_info,RedPixelChannel,0,0, + &value,exception); pixel.red=(double) QuantumRange*value; - status|=FxEvaluateChannelExpression(fx_info,GreenPixelChannel, - 0,0,&value,exception); + status|=FxEvaluateChannelExpression(fx_info,GreenPixelChannel,0,0, + &value,exception); pixel.green=(double) QuantumRange*value; - status|=FxEvaluateChannelExpression(fx_info,BluePixelChannel, - 0,0,&value,exception); + status|=FxEvaluateChannelExpression(fx_info,BluePixelChannel,0,0, + &value,exception); pixel.blue=(double) QuantumRange*value; if (image->colorspace == CMYKColorspace) { - status|=FxEvaluateChannelExpression(fx_info,BlackPixelChannel, - 0,0,&value,exception); + status|=FxEvaluateChannelExpression(fx_info,BlackPixelChannel,0,0, + &value,exception); pixel.black=(double) QuantumRange*value; } - status|=FxEvaluateChannelExpression(fx_info,AlphaPixelChannel, - 0,0,&value,exception); + status|=FxEvaluateChannelExpression(fx_info,AlphaPixelChannel,0,0, + &value,exception); pixel.alpha=(double) QuantumRange*value; fx_info=DestroyFxInfo(fx_info); if( IfMagickTrue(status) ) diff --git a/MagickCore/version.h b/MagickCore/version.h index 84c6ab617..c9722ccdc 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -39,12 +39,12 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 2 #define MagickppLibMinInterface 2 -#define MagickReleaseDate "2013-07-14" +#define MagickReleaseDate "2013-07-16" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" #define MagickDelegates "bzlib djvu fftw fontconfig freetype jng jp2 jpeg lcms lzma openexr pango png ps tiff x xml zlib" -#define MagickHomeURL "file:///usr/share/doc/ImageMagick-7/index.html" +#define MagickHomeURL "file:///usr/local/share/doc/ImageMagick-7/index.html" #if (MAGICKCORE_QUANTUM_DEPTH == 8) #define MagickQuantumDepth "Q8" #define MagickQuantumRange "255" diff --git a/PerlMagick/Makefile.PL b/PerlMagick/Makefile.PL index 5e4b89d36..8a8cd91ce 100644 --- a/PerlMagick/Makefile.PL +++ b/PerlMagick/Makefile.PL @@ -206,7 +206,7 @@ WriteMakefile 'INC' => $INC_magick, # C compiler - #'CC' => 'gcc -std=gnu99 -std=gnu99', + #'CC' => 'c++', # C pre-processor flags (e.g. -I & -D options) # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2", @@ -215,7 +215,7 @@ WriteMakefile 'CCFLAGS' => $CCFLAGS_magick, # Linker - #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'}, + #'LD' => $Config{'ld'} == $Config{'cc'} ? 'c++' : $Config{'ld'}, # Linker flags for building an executable 'LDFLAGS' => $LDFLAGS_magick, @@ -224,7 +224,7 @@ WriteMakefile 'LDDLFLAGS' => $LDDLFLAGS_magick, # Install PerlMagick binary into ImageMagick bin directory - 'INSTALLBIN' => '/usr/bin', + 'INSTALLBIN' => '/usr/local/bin', # Library specification 'LIBS' => [ $LIBS_magick ], @@ -236,12 +236,12 @@ WriteMakefile # 'OPTIMIZE' => '', # Use same compiler as ImageMagick - 'PERLMAINCC' => ' -fopenmp', + 'PERLMAINCC' => 'c++ -fopenmp', 'AR' => 'ar', - 'LD' => '', + 'LD' => 'c++', # Set Perl installation prefix to ImageMagick installation prefix -# 'PREFIX' => '/usr', +# 'PREFIX' => '/usr/local', # Include delegate directories in tests test => { TESTS => $delegate_tests}, @@ -266,6 +266,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/lib: ; + $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD = \$(PERLMAINCC) -L/usr/local/lib: ; $inherited; } diff --git a/PerlMagick/check.sh b/PerlMagick/check.sh index f7f8cba92..49926a718 100755 --- a/PerlMagick/check.sh +++ b/PerlMagick/check.sh @@ -42,10 +42,10 @@ fi if test -x PerlMagick -a -f Makefile.aperl ; then # Static build test incantation - ${MAKE} -f Makefile.aperl CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test + ${MAKE} -f Makefile.aperl CC='c++' TEST_VERBOSE=1 test elif test -f Makefile -a -f Magick.o; then # Shared build test incantation - ${MAKE} CC='gcc -std=gnu99 -std=gnu99' TEST_VERBOSE=1 test + ${MAKE} CC='c++' TEST_VERBOSE=1 test else echo 'PerlMagick has not been built!' exit 1 diff --git a/PerlMagick/quantum/Makefile.PL b/PerlMagick/quantum/Makefile.PL index 2eeca24e0..24fc6768c 100644 --- a/PerlMagick/quantum/Makefile.PL +++ b/PerlMagick/quantum/Makefile.PL @@ -203,7 +203,7 @@ WriteMakefile 'INC' => $INC_magick, # C compiler - #'CC' => 'gcc -std=gnu99 -std=gnu99', + #'CC' => 'c++', # C pre-processor flags (e.g. -I & -D options) # 'CPPFLAGS' => "$Config{'cppflags'} -pthread -I/usr/include/pango-1.0 -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib64/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/freetype2 -I/usr/include/libpng15 -I/usr/include/libdrm -DMAGICKCORE_HDRI_ENABLE=1 -DMAGICKCORE_QUANTUM_DEPTH=16 -I/usr/include/libxml2", @@ -212,7 +212,7 @@ WriteMakefile 'CCFLAGS' => $CCFLAGS_magick, # Linker - #'LD' => $Config{'ld'} == $Config{'cc'} ? 'gcc -std=gnu99 -std=gnu99' : $Config{'ld'}, + #'LD' => $Config{'ld'} == $Config{'cc'} ? 'c++' : $Config{'ld'}, # Linker flags for building an executable 'LDFLAGS' => $LDFLAGS_magick, @@ -221,7 +221,7 @@ WriteMakefile 'LDDLFLAGS' => $LDDLFLAGS_magick, # Install PerlMagick binary into ImageMagick bin directory - 'INSTALLBIN' => '/usr/bin', + 'INSTALLBIN' => '/usr/local/bin', # Library specification 'LIBS' => [ $LIBS_magick ], @@ -233,14 +233,14 @@ WriteMakefile # 'OPTIMIZE' => '', # Use same compiler as ImageMagick - 'PERLMAINCC' => ' -fopenmp', + 'PERLMAINCC' => 'c++ -fopenmp', 'PM' => { 'Q16HDRI.pm' => '$(INST_LIBDIR)/Q16HDRI.pm' }, 'XS' => { 'Q16HDRI.xs' => 'Q16HDRI.xs' }, 'AR' => 'ar', - 'LD' => '', + 'LD' => 'c++', # Set Perl installation prefix to ImageMagick installation prefix -# 'PREFIX' => '/usr', +# 'PREFIX' => '/usr/local', # 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/lib: ; + $inherited =~ s:MAP_LINKCMD\s.*\s*\$\(CC\):MAP_LINKCMD = \$(PERLMAINCC) -L/usr/local/lib: ; $inherited; } diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm index 6df5cc5f3..071fd1d2e 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/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/coders/jpeg.c b/coders/jpeg.c index 88af055c1..881296fcd 100644 --- a/coders/jpeg.c +++ b/coders/jpeg.c @@ -1271,7 +1271,10 @@ static Image *ReadJPEGImage(const ImageInfo *image_info, memory_info=AcquireVirtualMemory((size_t) image->columns, jpeg_info.output_components*sizeof(*jpeg_pixels)); if (memory_info == (MemoryInfo *) NULL) - ThrowWriterException(ResourceLimitError,"MemoryAllocationFailed"); + { + jpeg_destroy_decompress(&jpeg_info); + ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); + } jpeg_pixels=(JSAMPLE *) GetVirtualMemoryBlob(memory_info); /* Convert JPEG pixels to pixel packets. diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1 index 05f946e94..7e4cf073a 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/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-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 +\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 diff --git a/utilities/animate.1 b/utilities/animate.1 index a5be96990..4800181c7 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/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: \-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/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/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 10687f313..4bbede1e1 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/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: \-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/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/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 68bbbe9e2..254722c00 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/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 @@ -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/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/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 1c5064dea..d1fa0c63f 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/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-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 +\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 diff --git a/utilities/convert.1 b/utilities/convert.1 index 125971470..93916ee00 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/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 @@ -284,4 +284,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/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/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 f44c0216c..9c2f239d4 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/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: \-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/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/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 8abe29006..abac62114 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/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: \-antialias remove pixel-aliasing @@ -68,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/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/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 11426cae0..5e27f5f43 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/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 @@ -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/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/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 04ba4434a..7c2681c9f 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/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 @@ -283,4 +283,4 @@ ImageMagick(1) .SH COPYRIGHT -\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 +\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 diff --git a/utilities/montage.1 b/utilities/montage.1 index 1bc7ce1f5..d85a08950 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/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 @@ -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/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/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 3b8bc2a4b..b99d7f487 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/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 @@ -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/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/local/share/doc/ImageMagick-7/www/license.html or http://www.imagemagick.org/script/license.php\fP