From: cristy Date: Sun, 6 Jan 2013 23:01:40 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~4481 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d79e2361857bd3000860329d90daf1c5078ff760;p=imagemagick --- diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 8dac3b186..2dc1dbb83 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -1106,6 +1106,35 @@ MagickPrivate void ClonePixelCacheMethods(Cache clone,const Cache cache) % % % % % % ++ D i s t r i b u t e d P i x e l C a c h e % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% DistributedPixelCache() waits on the specified port for commands to +% create, read, update, or destroy a pixel cache. +% +% The format of the DistributedPixelCache() method is: +% +% void DistributedPixelCache(const size_t port) +% +% A description of each parameter follows: +% +% o port: connect the distributed pixel cache at this port. +% +*/ +MagickExport void DistributedPixelCache(const size_t port) +{ + (void) port; + for ( ; ; ) sleep(1); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % + D e s t r o y I m a g e P i x e l C a c h e % % % % % diff --git a/MagickWand/animate.c b/MagickWand/animate.c index 4512abbe0..5bf920d0b 100644 --- a/MagickWand/animate.c +++ b/MagickWand/animate.c @@ -106,6 +106,8 @@ static MagickBooleanType AnimateUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/compare.c b/MagickWand/compare.c index 0531d4bc0..767f80004 100644 --- a/MagickWand/compare.c +++ b/MagickWand/compare.c @@ -89,6 +89,8 @@ static MagickBooleanType CompareUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/composite.c b/MagickWand/composite.c index 52dc05e71..531062f5c 100644 --- a/MagickWand/composite.c +++ b/MagickWand/composite.c @@ -233,6 +233,8 @@ static MagickBooleanType CompositeUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/conjure.c b/MagickWand/conjure.c index ae3a56bb2..7e5e3f6a6 100644 --- a/MagickWand/conjure.c +++ b/MagickWand/conjure.c @@ -96,6 +96,8 @@ static MagickBooleanType ConjureUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/convert.c b/MagickWand/convert.c index 57b1fe849..5d9a656a2 100644 --- a/MagickWand/convert.c +++ b/MagickWand/convert.c @@ -145,6 +145,8 @@ static MagickBooleanType ConvertUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/display.c b/MagickWand/display.c index 4f722aea0..122317b02 100644 --- a/MagickWand/display.c +++ b/MagickWand/display.c @@ -109,6 +109,8 @@ static MagickBooleanType DisplayUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/identify.c b/MagickWand/identify.c index 16727ee34..ee5c4f55c 100644 --- a/MagickWand/identify.c +++ b/MagickWand/identify.c @@ -99,6 +99,8 @@ static MagickBooleanType IdentifyUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/import.c b/MagickWand/import.c index 2a0a1ab7a..1e56d5a68 100644 --- a/MagickWand/import.c +++ b/MagickWand/import.c @@ -99,6 +99,8 @@ static MagickBooleanType ImportUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c index de08ab23d..81b0239f9 100644 --- a/MagickWand/mogrify.c +++ b/MagickWand/mogrify.c @@ -46,10 +46,9 @@ */ #include "MagickWand/studio.h" #include "MagickWand/MagickWand.h" -#include "MagickWand/mogrify-private.h" -#undef DegreesToRadians -#undef RadiansToDegrees +#include "MagickCore/cache-private.h" #include "MagickCore/image-private.h" +#include "MagickWand/mogrify-private.h" #include "MagickCore/monitor-private.h" #include "MagickCore/string-private.h" #include "MagickCore/thread-private.h" @@ -152,6 +151,8 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info, concurrent=MagickTrue; if (LocaleCompare("-debug",option) == 0) (void) SetLogEventMask(argv[++i]); + if (LocaleCompare("-distributed-cache",option) == 0) + DistributedPixelCache(StringToUnsignedLong(argv[++i])); if (LocaleCompare("-duration",option) == 0) duration=StringToDouble(argv[++i],(char **) NULL); if (LocaleCompare("-regard-warnings",option) == 0) @@ -3214,6 +3215,8 @@ static MagickBooleanType MogrifyUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/montage.c b/MagickWand/montage.c index 09975af6b..66649414e 100644 --- a/MagickWand/montage.c +++ b/MagickWand/montage.c @@ -90,6 +90,8 @@ static MagickBooleanType MontageUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information", diff --git a/MagickWand/stream.c b/MagickWand/stream.c index 1962adf84..247113ec2 100644 --- a/MagickWand/stream.c +++ b/MagickWand/stream.c @@ -93,6 +93,8 @@ static MagickBooleanType StreamUsage(void) *miscellaneous[]= { "-debug events display copious debugging information", + "-distributed-cache port", + " distributed pixel cache spanning one or more servers", "-help print program options", "-list type print a list of supported option arguments", "-log format format of debugging information",