From 7a2600242e8e06bf9ced1c79407364a7f7efec1f Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 10 Jan 2013 00:50:19 +0000 Subject: [PATCH] --- MagickCore/cache.c | 12 ++++++------ MagickCore/distribute-cache.c | 5 +++++ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/MagickCore/cache.c b/MagickCore/cache.c index b9f94cb8f..8eb5699a0 100644 --- 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 0d713c59f..124929f72 100644 --- 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); } @@ -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); -- 2.40.0