From: Cristy <urban-warrior@imagemagick.org>
Date: Mon, 24 Apr 2017 17:17:44 +0000 (-0400)
Subject: ...
X-Git-Tag: 7.0.5-5
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f1208a9c0b5abcea0dab90d1cd60435265e529bd;p=imagemagick

...
---

diff --git a/ChangeLog b/ChangeLog
index 7c6c4e0fa..4cd0fd9d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
 2017-04-24  7.0.5-5 Cristy  <quetzlzacatenango@image...>
-  * Release ImageMagick version 7.0.5-5, GIT revision 19908:bc92979:20170424.
+  * Release ImageMagick version 7.0.5-5, GIT revision 19915:12eec43:20170424.
 
 2017-03-26  7.0.5-5 Cristy  <quetzlzacatenango@image...>
   * Minimize buffer copies to improve OpenCL performance.
diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index d27e714d5..1f008b7f4 100644
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3823,34 +3823,6 @@ MagickExport MagickBooleanType PersistPixelCache(Image *image,
       *offset+=cache_info->length+page_size-(cache_info->length % page_size);
       return(MagickTrue);
     }
-  if ((cache_info->mode != ReadMode) &&
-      ((cache_info->type == DiskCache) || (cache_info->type == MapCache)) &&
-      (cache_info->reference_count == 1))
-    {
-      LockSemaphoreInfo(cache_info->semaphore);
-      if ((cache_info->mode != ReadMode) &&
-          ((cache_info->type == DiskCache) || (cache_info->type == MapCache)) &&
-          (cache_info->reference_count == 1))
-        {
-          /*
-            Usurp existing persistent pixel cache.
-          */
-          if (rename_utf8(cache_info->cache_filename, filename) == 0)
-            {
-              (void) CopyMagickString(cache_info->cache_filename,filename,
-                MagickPathExtent);
-              *offset+=cache_info->length+page_size-(cache_info->length %
-                page_size);
-              UnlockSemaphoreInfo(cache_info->semaphore);
-              cache_info=(CacheInfo *) ReferencePixelCache(cache_info);
-              if (image->debug != MagickFalse)
-                (void) LogMagickEvent(CacheEvent,GetMagickModule(),
-                  "Usurp resident persistent cache");
-              return(MagickTrue);
-            }
-        }
-      UnlockSemaphoreInfo(cache_info->semaphore);
-    }
   /*
     Clone persistent pixel cache.
   */
diff --git a/coders/mpc.c b/coders/mpc.c
index 88e30eb71..2b8e6ab92 100644
--- a/coders/mpc.c
+++ b/coders/mpc.c
@@ -1467,16 +1467,8 @@ static MagickBooleanType WriteMPCImage(const ImageInfo *image_info,Image *image,
     /*
       Initialize persistent pixel cache.
     */
-    {
-      Image *clone_image = CloneImage(image,0,0,MagickTrue,exception);
-      if (clone_image == (Image *) NULL)
-        ThrowWriterException(CacheError,"UnableToPersistPixelCache");
-      status=PersistPixelCache(clone_image,cache_filename,MagickFalse,&offset,
-        exception);
-      clone_image=DestroyImage(clone_image);
-      if (status == MagickFalse)
-        ThrowWriterException(CacheError,"UnableToPersistPixelCache");
-    }
+    status=PersistPixelCache(image,cache_filename,MagickFalse,&offset,
+      exception);
     if (GetNextImageInList(image) == (Image *) NULL)
       break;
     image=SyncNextImageInList(image);