From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 10 Mar 2018 13:10:55 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.7-26~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=da6b6b87e82a0e2825f1cc995cc7fa9f0d6881c7;p=imagemagick

...
---

diff --git a/MagickCore/memory.c b/MagickCore/memory.c
index 8a8556ba5..4ef438614 100644
--- a/MagickCore/memory.c
+++ b/MagickCore/memory.c
@@ -478,7 +478,7 @@ MagickExport void *AcquireMagickMemory(const size_t size)
             i;
 
           assert(2*sizeof(size_t) > (size_t) (~SizeMask));
-          (void) ResetMagickMemory(&memory_pool,0,sizeof(memory_pool));
+          (void) memset(&memory_pool,0,sizeof(memory_pool));
           memory_pool.allocation=SegmentSize;
           memory_pool.blocks[MaxBlocks]=(void *) (-1);
           for (i=0; i < MaxSegments; i++)
@@ -614,7 +614,7 @@ MagickExport MemoryInfo *AcquireVirtualMemory(const size_t count,
     sizeof(*memory_info)));
   if (memory_info == (MemoryInfo *) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-  (void) ResetMagickMemory(memory_info,0,sizeof(*memory_info));
+  (void) memset(memory_info,0,sizeof(*memory_info));
   extent=count*quantum;
   memory_info->length=extent;
   memory_info->signature=MagickCoreSignature;
@@ -772,7 +772,7 @@ MagickExport void DestroyMagickMemory(void)
       (void) UnmapBlob(memory_pool.segments[i]->allocation,
         memory_pool.segments[i]->length);
   free_segments=(DataSegmentInfo *) NULL;
-  (void) ResetMagickMemory(&memory_pool,0,sizeof(memory_pool));
+  (void) memset(&memory_pool,0,sizeof(memory_pool));
   UnlockSemaphoreInfo(memory_semaphore);
   RelinquishSemaphoreInfo(&memory_semaphore);
 #endif
diff --git a/coders/gray.c b/coders/gray.c
index 8d105ddeb..8aedd64fc 100644
--- a/coders/gray.c
+++ b/coders/gray.c
@@ -211,7 +211,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
       default:
       {
         /*
-          No interlacing:  GRAYGRAYGRAYGRAYGRAYGRAY...
+          No interlacing:  GGG...
         */
         if (scene == 0)
           {
@@ -293,7 +293,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
           };
 
         /*
-          Line interlacing:  GGG...
+          Line interlacing:  G...G...G...
         */
         if (scene == 0)
           {
@@ -381,7 +381,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
       case PlaneInterlace:
       {
         /*
-          Plane interlacing:  GGG...
+          Plane interlacing:  G...G...G...
         */
         if (scene == 0)
           {
@@ -514,7 +514,7 @@ static Image *ReadGRAYImage(const ImageInfo *image_info,
       case PartitionInterlace:
       {
         /*
-          Partition interlacing:  GGG...
+          Partition interlacing:  G..., G..., G...
         */
         AppendImageFormat("R",image->filename);
         status=OpenBlob(image_info,image,ReadBinaryBlobMode,exception);
@@ -1073,7 +1073,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info,
       case LineInterlace:
       {
         /*
-          Line interlacing:  GGG...
+          Line interlacing:  G...G...G...
         */
         for (y=0; y < (ssize_t) image->rows; y++)
         {
@@ -1109,7 +1109,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info,
       case PlaneInterlace:
       {
         /*
-          Plane interlacing:  GGG...
+          Plane interlacing:  G...G...G...
         */
         for (y=0; y < (ssize_t) image->rows; y++)
         {
@@ -1168,7 +1168,7 @@ static MagickBooleanType WriteGRAYImage(const ImageInfo *image_info,
       case PartitionInterlace:
       {
         /*
-          Partition interlacing:  GGG...
+          Partition interlacing:  G..., G..., G...
         */
         AppendImageFormat("G",image->filename);
         status=OpenBlob(image_info,image,scene == 0 ? WriteBinaryBlobMode :