From 47950f61e314f5a39f6a584b5223bbf2dc91a454 Mon Sep 17 00:00:00 2001 From: Cristy Date: Fri, 18 Dec 2015 18:31:40 -0500 Subject: [PATCH] Minor improvements to the thread-specific data methods --- MagickCore/thread.c | 122 ++++++++++++++++++++++++++-------- MagickCore/thread_.h | 10 +-- PerlMagick/quantum/quantum.pm | 2 +- coders/tiff.c | 12 ++-- 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, 132 insertions(+), 64 deletions(-) diff --git a/MagickCore/thread.c b/MagickCore/thread.c index e9cb4ccfc..34eb5499f 100644 --- a/MagickCore/thread.c +++ b/MagickCore/thread.c @@ -43,34 +43,73 @@ #include "MagickCore/thread_.h" #include "MagickCore/thread-private.h" +/* + Typedef declarations. +*/ +typedef struct _MagickThreadValue +{ + size_t + number_threads; + + void + **values, + (*destructor)(void *); +} MagickThreadValue; + /* %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % % % % % -% M a g i c k C r e a t e T h r e a d K e y % +% C r e a t e M a g i c k T h r e a d K e y % % % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickCreateThreadKey() creates a thread key and returns it. +% CreateMagickThreadKey() creates a thread-specific data key visible to all +% threads in the process. +% +% The format of the CreateMagickThreadKey method is: +% +% MagickThreadKey CreateMagickThreadKey(MagickThreadKey *key) +% +% A description of each parameter follows: % -% The format of the MagickCreateThreadKey method is: +% o key: opaque objects used to locate thread-specific data. % -% MagickThreadKey MagickCreateThreadKey(MagickThreadKey *key) +% o destructor: associate an optional destructor with each key value. % */ -MagickExport MagickBooleanType MagickCreateThreadKey(MagickThreadKey *key) +MagickExport MagickBooleanType CreateMagickThreadKey(MagickThreadKey *key, + void (*destructor)(void *)) { #if defined(MAGICKCORE_THREAD_SUPPORT) - return(pthread_key_create(key,NULL) == 0 ? MagickTrue : MagickFalse); + return(pthread_key_create(key,destructor) == 0 ? MagickTrue : MagickFalse); #elif defined(MAGICKCORE_HAVE_WINTHREADS) *key=TlsAlloc(); return(*key != TLS_OUT_OF_INDEXES ? MagickTrue : MagickFalse); #else - *key=AcquireMagickMemory(sizeof(key)); - return(*key != (void *) NULL ? MagickTrue : MagickFalse); + { + MagickThreadValue + **keys; + + keys=(MagickThreadValue **) key; + *keys=(MagickThreadValue *) AcquireQuantumMemory(1,sizeof(*keys)); + if (*keys != (MagickThreadValue *) NULL) + { + (*keys)->number_threads=GetOpenMPMaximumThreads(); + (*keys)->values=AcquireQuantumMemory((*keys)->number_threads, + sizeof(void *)); + if ((*keys)->values == (void *) NULL) + *keys=RelinquishMagickMemory(*keys); + else + (void) memset((*keys)->values,0,(*keys)->number_threads* + sizeof(void *)); + (*keys)->destructor=destructor; + } + return((*keys != (MagickThreadValue *) NULL) ? MagickTrue : MagickFalse); + } #endif } @@ -79,31 +118,46 @@ MagickExport MagickBooleanType MagickCreateThreadKey(MagickThreadKey *key) % % % % % % -% M a g i c k D e l e t e T h r e a d K e y % +% D e s t r o y M a g i c k T h r e a d K e y % % % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickDeleteThreadKey() deletes a thread key. +% DeleteMagickThreadKey() deletes a thread-specific data key. % -% The format of the MagickDeleteThreadKey method is: +% The format of the DeleteMagickThreadKey method is: % -% MagickBooleanType MagickDeleteThreadKey(MagickThreadKey key) +% MagickBooleanType DeleteMagickThreadKey(MagickThreadKey key) % % A description of each parameter follows: % % o key: the thread key. % */ -MagickExport MagickBooleanType MagickDeleteThreadKey(MagickThreadKey key) +MagickExport MagickBooleanType DeleteMagickThreadKey(MagickThreadKey key) { #if defined(MAGICKCORE_THREAD_SUPPORT) return(pthread_key_delete(key) == 0 ? MagickTrue : MagickFalse); #elif defined(MAGICKCORE_HAVE_WINTHREADS) return(TlsFree(key) != 0 ? MagickTrue : MagickFalse); #else - key=(MagickThreadKey) RelinquishMagickMemory(key); + { + MagickThreadValue + *keys; + + register ssize_t + i; + + keys=(MagickThreadValue *) key; + for (i=0; i < (ssize_t) keys->number_threads; i++) + if (keys->values[i] != (void *) NULL) + { + keys->destructor(keys->values[i]); + keys->values[i]=(void *) NULL; + } + keys=(MagickThreadValue *) RelinquishMagickMemory(keys); + } return(MagickTrue); #endif } @@ -113,31 +167,38 @@ MagickExport MagickBooleanType MagickDeleteThreadKey(MagickThreadKey key) % % % % % % -% M a g i c k G e t T h r e a d V a l u e % +% G e t M a g i c k T h r e a d V a l u e % % % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickGetThreadValue() returns a value associated with the thread key. +% GetMagickThreadValue() returns the value currently bound to the specified +% key on behalf of the calling thread. % -% The format of the MagickGetThreadValue method is: +% The format of the GetMagickThreadValue method is: % -% void *MagickGetThreadValue(MagickThreadKey key) +% void *GetMagickThreadValue(MagickThreadKey key) % % A description of each parameter follows: % % o key: the thread key. % */ -MagickExport void *MagickGetThreadValue(MagickThreadKey key) +MagickExport void *GetMagickThreadValue(MagickThreadKey key) { #if defined(MAGICKCORE_THREAD_SUPPORT) return(pthread_getspecific(key)); #elif defined(MAGICKCORE_HAVE_WINTHREADS) return(TlsGetValue(key)); #else - return((void *) (*key)); + { + MagickThreadValue + *keys; + + keys=(MagickThreadValue *) key; + return(keys->values[GetOpenMPThreadId()]); + } #endif } @@ -146,27 +207,28 @@ MagickExport void *MagickGetThreadValue(MagickThreadKey key) % % % % % % -% M a g i c k S e t T h r e a d V a l u e % +% S e t M a g i c k T h r e a d V a l u e % % % % % % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -% MagickSetThreadValue() associates a value with the thread key. +% SetMagickThreadValue() binds a value to the specified key on behalf of the +% calling thread. % -% The format of the MagickSetThreadValue method is: +% The format of the SetMagickThreadValue method is: % -% MagickBooleanType MagickSetThreadValue(MagickThreadKey key, +% MagickBooleanType SetMagickThreadValue(MagickThreadKey key, % const void *value) % % A description of each parameter follows: % % o key: the thread key. % -% o value: the value +% o value: the value. % */ -MagickExport MagickBooleanType MagickSetThreadValue(MagickThreadKey key, +MagickExport MagickBooleanType SetMagickThreadValue(MagickThreadKey key, const void *value) { #if defined(MAGICKCORE_THREAD_SUPPORT) @@ -174,7 +236,13 @@ MagickExport MagickBooleanType MagickSetThreadValue(MagickThreadKey key, #elif defined(MAGICKCORE_HAVE_WINTHREADS) return(TlsSetValue(key,(void *) value) != 0 ? MagickTrue : MagickFalse); #else - *key=(size_t) value; + { + MagickThreadValue + *keys; + + keys=(MagickThreadValue *) key; + keys->values[GetOpenMPThreadId()]=(void *) value; + } return(MagickTrue); #endif } diff --git a/MagickCore/thread_.h b/MagickCore/thread_.h index bc5cbd94a..15fa3082d 100644 --- a/MagickCore/thread_.h +++ b/MagickCore/thread_.h @@ -35,16 +35,16 @@ typedef pthread_key_t MagickThreadKey; #elif defined(MAGICKCORE_HAVE_WINTHREADS) typedef DWORD MagickThreadKey; #else -typedef size_t *MagickThreadKey; +typedef void *MagickThreadKey; #endif extern MagickExport MagickBooleanType - MagickCreateThreadKey(MagickThreadKey *), - MagickDeleteThreadKey(MagickThreadKey), - MagickSetThreadValue(MagickThreadKey,const void *); + CreateMagickThreadKey(MagickThreadKey *,void (*destructor)(void *)), + DeleteMagickThreadKey(MagickThreadKey), + SetMagickThreadValue(MagickThreadKey,const void *); extern MagickExport void - *MagickGetThreadValue(MagickThreadKey); + *GetMagickThreadValue(MagickThreadKey); #if defined(__cplusplus) || defined(c_plusplus) } diff --git a/PerlMagick/quantum/quantum.pm b/PerlMagick/quantum/quantum.pm index 5564b4ab4..4e9aa935c 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/tiff.c b/coders/tiff.c index 7d5c09ac3..44ede50f2 100755 --- a/coders/tiff.c +++ b/coders/tiff.c @@ -551,7 +551,7 @@ static void TIFFErrors(const char *module,const char *format,va_list error) (void) vsprintf(message,format,error); #endif (void) ConcatenateMagickString(message,".",MagickPathExtent); - exception=(ExceptionInfo *) MagickGetThreadValue(tiff_exception); + exception=(ExceptionInfo *) GetMagickThreadValue(tiff_exception); if (exception != (ExceptionInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),CoderError,message, "`%s'",module); @@ -891,7 +891,7 @@ static void TIFFWarnings(const char *module,const char *format,va_list warning) (void) vsprintf(message,format,warning); #endif (void) ConcatenateMagickString(message,".",MagickPathExtent); - exception=(ExceptionInfo *) MagickGetThreadValue(tiff_exception); + exception=(ExceptionInfo *) GetMagickThreadValue(tiff_exception); if (exception != (ExceptionInfo *) NULL) (void) ThrowMagickException(exception,GetMagickModule(),CoderWarning, message,"`%s'",module); @@ -1151,7 +1151,7 @@ static Image *ReadTIFFImage(const ImageInfo *image_info, image=DestroyImageList(image); return((Image *) NULL); } - (void) MagickSetThreadValue(tiff_exception,exception); + (void) SetMagickThreadValue(tiff_exception,exception); error_handler=TIFFSetErrorHandler(TIFFErrors); warning_handler=TIFFSetWarningHandler(TIFFWarnings); tiff=TIFFClientOpen(image->filename,"rb",(thandle_t) image,TIFFReadBlob, @@ -2252,7 +2252,7 @@ ModuleExport size_t RegisterTIFFImage(void) LockSemaphoreInfo(tiff_semaphore); if (instantiate_key == MagickFalse) { - if (MagickCreateThreadKey(&tiff_exception) == MagickFalse) + if (CreateMagickThreadKey(&tiff_exception,NULL) == MagickFalse) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); #if defined(MAGICKCORE_HAVE_TIFFMERGEFIELDINFO) && defined(MAGICKCORE_HAVE_TIFFSETTAGEXTENDER) if (tag_extender == (TIFFExtendProc) NULL) @@ -2379,7 +2379,7 @@ ModuleExport void UnregisterTIFFImage(void) if (tag_extender == (TIFFExtendProc) NULL) (void) TIFFSetTagExtender(tag_extender); #endif - if (MagickDeleteThreadKey(tiff_exception) == MagickFalse) + if (DeleteMagickThreadKey(tiff_exception) == MagickFalse) ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed"); instantiate_key=MagickFalse; } @@ -3148,7 +3148,7 @@ static MagickBooleanType WriteTIFFImage(const ImageInfo *image_info, status=OpenBlob(image_info,image,WriteBinaryBlobMode,exception); if (status == MagickFalse) return(status); - (void) MagickSetThreadValue(tiff_exception,exception); + (void) SetMagickThreadValue(tiff_exception,exception); error_handler=TIFFSetErrorHandler((TIFFErrorHandler) TIFFErrors); warning_handler=TIFFSetWarningHandler((TIFFErrorHandler) TIFFWarnings); endian_type=UndefinedEndian; diff --git a/configure b/configure index 22fa2ba56..f70cbc2f7 100755 --- a/configure +++ b/configure @@ -4387,7 +4387,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_GIT_REVISION=17309:8b3e119:20151217 +MAGICK_GIT_REVISION=17326:b7f3404:20151218 # Substitute library versioning diff --git a/utilities/ImageMagick.1 b/utilities/ImageMagick.1 index 6b4b59fb5..38ea0b284 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-2016 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-2016 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 cfa674054..6a5b371c8 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: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -98,4 +98,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 f7bd8c244..53596f5bc 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: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -76,4 +76,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 dd094d436..f4ca21455 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 @@ -113,4 +113,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 37acb8b52..f14ebd4b1 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-2016 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-2016 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 5e1e6ba60..480f0dc06 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 @@ -321,4 +321,4 @@ By default, the image format of `file' is determined by its magic number. To sp ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 c7d2619fb..b11476584 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: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -136,4 +136,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 90f491850..92df22f94 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: \-alpha option on, activate, off, deactivate, set, opaque, copy @@ -76,4 +76,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 bf8a977a4..1e71fb6b1 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 @@ -96,4 +96,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 635e51eeb..3afd8ba77 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 @@ -319,4 +319,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 703659b8f..5173fd755 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 @@ -142,4 +142,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 7cbc88318..0d362be53 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 @@ -56,4 +56,4 @@ ImageMagick(1) .SH COPYRIGHT -\fBCopyright (C) 1999-2016 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-2016 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 -- 2.40.0