...

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index f50c814f69e13bfe64fc5ff161b17c2473e6c4ce..49edbde95d957f620b664faf54227295a743061a 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3401,6 +3401,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
       if (((cache_info->type == UndefinedCache) && (status != MagickFalse)) ||
           (cache_info->type == MemoryCache))
         {
+          status=MagickTrue;
           cache_info->mapped=MagickFalse;
           cache_info->pixels=(Quantum *) MagickAssumeAligned(
             AcquireAlignedMemory(1,(size_t) cache_info->length));
@@ -3411,7 +3412,6 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
               /*
                 Create memory pixel cache.
               */
-              status=MagickTrue;
               cache_info->type=MemoryCache;
               cache_info->metacontent=(void *) NULL;
               if (cache_info->metacontent_extent != 0)
@@ -3470,6 +3470,7 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
               /*
                 Create a distributed pixel cache.
               */
+              status=MagickTrue;
               cache_info->type=DistributedCache;
               cache_info->server_info=server_info;
               (void) FormatLocaleString(cache_info->cache_filename,
@@ -3500,11 +3501,10 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
                     message);
                 }
-              return(MagickTrue);
+              return(status);
             }
         }
       RelinquishMagickResource(DiskResource,cache_info->length);
-      cache_info->type=UndefinedCache;
       (void) ThrowMagickException(exception,GetMagickModule(),CacheError,
         "CacheResourcesExhausted","`%s'",image->filename);
       return(MagickFalse);
@@ -3517,7 +3517,6 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
   if (OpenPixelCacheOnDisk(cache_info,mode) == MagickFalse)
     {
       RelinquishMagickResource(DiskResource,cache_info->length);
-      cache_info->type=UndefinedCache;
       ThrowFileException(exception,CacheError,"UnableToOpenPixelCache",
         image->filename);
       return(MagickFalse);
@@ -3526,7 +3525,6 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
     cache_info->length);
   if (status == MagickFalse)
     {
-      cache_info->type=UndefinedCache;
       ThrowFileException(exception,CacheError,"UnableToExtendCache",
         image->filename);
       return(MagickFalse);
@@ -3588,8 +3586,6 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
                   (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",
                     message);
                 }
-              if (status == MagickFalse)
-                cache_info->type=UndefinedCache;
               return(status);
             }
         }
@@ -3614,8 +3610,6 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
         cache_info->number_channels,format);
       (void) LogMagickEvent(CacheEvent,GetMagickModule(),"%s",message);
     }
-  if (status == MagickFalse)
-    cache_info->type=UndefinedCache;
   return(status);
 }
 \f