From: cristy <urban-warrior@git.imagemagick.org>
Date: Fri, 11 Jan 2013 12:14:51 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4442
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7675e609841071860c061d6be54ed7129afa9259;p=imagemagick

---

diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 4ebc73863..ab29a032b 100644
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -167,8 +167,10 @@ MagickPrivate DistributeCacheInfo *DestroyDistributeCacheInfo(
 %
 %    o port: connect the distributed pixel cache at this port.
 %
+%    o exception: return any errors or warnings in this structure.
+%
 */
-MagickExport void PixelCacheServer(const size_t port)
+MagickExport void PixelCacheServer(const size_t port,ExceptionInfo *exception)
 {
 #if defined(MAGICKCORE_HAVE_SOCKET) && defined(MAGICKCORE_HAVE_PTHREAD)
   char
@@ -250,6 +252,7 @@ MagickExport void PixelCacheServer(const size_t port)
   }
 #else
   (void) ThrowMagickException(exception,GetMagickModule(),MissingDelegateError,
-    "DelegateLibrarySupportNotBuiltIn","'%s' (socket)",image_info->filename);
+    "DelegateLibrarySupportNotBuiltIn","'%s' (socket)",
+    "distributed pixel cache");
 #endif
 }
diff --git a/MagickCore/distribute-cache.h b/MagickCore/distribute-cache.h
index 6838e4d0a..669f46289 100644
--- a/MagickCore/distribute-cache.h
+++ b/MagickCore/distribute-cache.h
@@ -22,8 +22,10 @@
 extern "C" {
 #endif
 
+#include <MagickCore/exception.h>
+
 extern MagickExport void
-  PixelCacheServer(const size_t);
+  PixelCacheServer(const size_t,ExceptionInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)
 }
diff --git a/MagickWand/mogrify.c b/MagickWand/mogrify.c
index 5362bc15f..3c9fbf3cd 100644
--- a/MagickWand/mogrify.c
+++ b/MagickWand/mogrify.c
@@ -154,7 +154,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info,
       (void) SetLogEventMask(argv[++i]);
     if (LocaleCompare("-distribute-cache",option) == 0)
       {
-        PixelCacheServer(StringToUnsignedLong(argv[++i]));
+        PixelCacheServer(StringToUnsignedLong(argv[++i]),exception);
         exit(0);
       }
     if (LocaleCompare("-duration",option) == 0)