https://github.com/ImageMagick/ImageMagick/issues/202

diff --git a/ChangeLog b/ChangeLog
index ff25ae2abfdf89c60e9d4728fa11509873efd324..afcdad38ca05c1bd69217e28dce315f0b41d31d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2016-05-18  7.0.1-5 Cristy  <quetzlzacatenango@image...>
+  * Process channels independently for -channel -equalize (reference
+    https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=29708).
+  * Fix pixel cache on disk regression (reference
+    https://github.com/ImageMagick/ImageMagick/issues/202).
+
+
 2016-05-15  7.0.1-4 Cristy  <quetzlzacatenango@image...>
   * Release ImageMagick version 7.0.1-4, GIT revision 10778:52dae14:20160516.
 

diff --git a/MagickCore/cache.c b/MagickCore/cache.c
index 921ddbf27e92a604c29ba571026071b729037788..f50c814f69e13bfe64fc5ff161b17c2473e6c4ce 100644 (file)
--- a/MagickCore/cache.c
+++ b/MagickCore/cache.c
@@ -3540,9 +3540,13 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
       status=AcquireMagickResource(MapResource,cache_info->length);
       if ((status == MagickFalse) && (cache_info->type != MapCache) &&
           (cache_info->type != MemoryCache))
-        cache_info->type=DiskCache;
+        {
+          status=MagickTrue;
+          cache_info->type=DiskCache;
+        }
       else
         {
+          status=MagickTrue;
           cache_info->pixels=(Quantum *) MapBlob(cache_info->file,mode,
             cache_info->offset,(size_t) cache_info->length);
           if (cache_info->pixels == (Quantum *) NULL)
@@ -3555,7 +3559,6 @@ static MagickBooleanType OpenPixelCache(Image *image,const MapMode mode,
               /*
                 Create file-backed memory-mapped pixel cache.
               */
-              status=MagickTrue;
               (void) ClosePixelCacheOnDisk(cache_info);
               cache_info->type=MapCache;
               cache_info->mapped=MagickTrue;

diff --git a/utilities/magick.c b/utilities/magick.c
index 3c304abc364a4923f16a322a57b12f1826594a5c..52b0f11e5ea863cbe55f39dd746c4033f6a2b454 100644 (file)
--- a/utilities/magick.c
+++ b/utilities/magick.c
@@ -145,10 +145,10 @@ static int MagickMain(int argc,char **argv)
   status=MagickCommandGenesis(image_info,MagickCommands[i].command,argc,argv,
     MagickCommands[i].use_metadata ? &metadata : (char **) NULL,exception);
   if (metadata != (char *) NULL)
-  {
-    (void) fputs(metadata,stdout);
-    metadata=DestroyString(metadata);
-  }
+    {
+      (void) fputs(metadata,stdout);
+      metadata=DestroyString(metadata);
+    }
   if (MagickCommands[i].command != CompareImagesCommand)
     exit_code=status != MagickFalse ? 0 : 1;
   else