(no commit message)

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 8dac3b1869a1c43bde54a936d383c907c17a3194..2dc1dbb83c04fe0ce2b17fc79a69005771161378 100644 (file)
--- 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);
+}
+\f
+/*
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%                                                                             %
+%                                                                             %
+%                                                                             %
 +   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 4512abbe0b96e41fb9125096efcc399b80b20a7e..5bf920d0b5245389b687efed176f2831e27a1c2a 100644 (file)
--- 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 0531d4bc0ff8af8f5dfa927197b733a8af5bbc3e..767f8000421b2969767b1d07a46fdc1f9ab1154c 100644 (file)
--- 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 52dc05e717f251addf2d4493ac84fe396c48eb07..531062f5c7e3377b4d80ad55e49a162cfd9983bc 100644 (file)
--- 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 ae3a56bb21edc430c551e7deb6a409202a46a004..7e5e3f6a642f71011c2256f36bc5ba91f4ebca00 100644 (file)
--- 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 57b1fe8493fff2c1263418ebbbd5f6868fa9d019..5d9a656a296c8619372a142a3981ee41679d75ad 100644 (file)
--- 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 4f722aea03a6bb9cd6f7f1ab5b31c6ebe52a5c61..122317b0266e1bfb2158927c623452a058701999 100644 (file)
--- 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 16727ee34ab9922d6df774ab9711a813d89fdd47..ee5c4f55c1251b952dff82b3aae5d62f8c7b0501 100644 (file)
--- 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 2a0a1ab7a5b6db965eb93acf0b76577df6774e62..1e56d5a683769d5e765ac3d35273aaa10bc4cdc7 100644 (file)
--- 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 de08ab23d31dbce621db631513b52643ef8e590c..81b0239f947ca95ede40628196751f2add90c432 100644 (file)
--- 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 09975af6b72d76f8f4d31341b46dcf43e30528ba..66649414e9179856a509d84a4f1ae419442453ad 100644 (file)
--- 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 1962adf8422ad013619ed7f41c7e726f46111ee6..247113ec2bbab08fb92b9a9b2508ac2d0832fb22 100644 (file)
--- 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",