(no commit message)

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index b9f94cb8f2488c63729e1c9c026a815e0a2aaf6e..8eb5699a07103dd22e85417f0fbf59529b3f7fe8 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -1276,6 +1276,9 @@ MagickPrivate Cache DestroyPixelCache(Cache cache)
       (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
     }
   RelinquishPixelCachePixels(cache_info);
+  if (cache_info->distribute_cache_info != (DistributeCacheInfo *) NULL)
+    cache_info->distribute_cache_info=
+      DestroyDistributeCacheInfo(cache_info->distribute_cache_info);
   if (cache_info->nexus_info != (NexusInfo **) NULL)
     cache_info->nexus_info=DestroyPixelCacheNexus(cache_info->nexus_info,
       cache_info->number_threads);
@@ -3838,12 +3841,9 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
   status=AcquireMagickResource(DiskResource,cache_info->length);
   if (status == MagickFalse)
     {
-      const char
-        *hosts;
-
-      hosts=GetImageRegistry(StringRegistryType,"cache-hosts",exception);
-      if (hosts != (const char *) NULL)
-        abort();  /* create distributed cache */
+      cache_info->distribute_cache_info=AcquireDistributeCacheInfo();
+      if (cache_info->distribute_cache_info != (DistributeCacheInfo *) NULL)
+        return(MagickTrue);
       (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
         "CacheResourcesExhausted","`%s'",image->filename);
       return(MagickFalse);

diff --git a/MagickCore/distribute-cache.c b/MagickCore/distribute-cache.c
index 0d713c59f20f5e354e71ef0b28417ece85889a5f..124929f72b3a1d90b39dee21e2187a6e51797f44 100644 (file)
--- a/MagickCore/distribute-cache.c
+++ b/MagickCore/distribute-cache.c
@@ -86,6 +86,8 @@ MagickPrivate DistributeCacheInfo *AcquireDistributeCacheInfo(void)
   DistributeCacheInfo
     *distribute_cache_info;
 
+  distribute_cache_info=(DistributeCacheInfo *) NULL;
+#if defined(MAGICKCORE_HAVE_SOCKET) && defined(MAGICKCORE_HAVE_PTHREAD)
   distribute_cache_info=(DistributeCacheInfo *) AcquireMagickMemory(
     sizeof(*distribute_cache_info));
   if (distribute_cache_info == (DistributeCacheInfo *) NULL)
@@ -93,6 +95,7 @@ MagickPrivate DistributeCacheInfo *AcquireDistributeCacheInfo(void)
   (void) ResetMagickMemory(distribute_cache_info,0,
     sizeof(*distribute_cache_info));
   distribute_cache_info->signature=MagickSignature;
+#endif
   return(distribute_cache_info);
 }
 \f
@@ -125,6 +128,8 @@ MagickPrivate DistributeCacheInfo *DestroyDistributeCacheInfo(
 {
   assert(distribute_cache_info != (DistributeCacheInfo *) NULL);
   assert(distribute_cache_info->signature == MagickSignature);
+#if defined(MAGICKCORE_HAVE_SOCKET) && defined(MAGICKCORE_HAVE_PTHREAD)
+#endif
   distribute_cache_info->signature=(~MagickSignature);
   distribute_cache_info=(DistributeCacheInfo *)
     RelinquishMagickMemory(distribute_cache_info);