]> granicus.if.org Git - imagemagick/commitdiff
https://www.imagemagick.org/discourse-server/viewtopic.php?f=3&t=31262
authorCristy <urban-warrior@imagemagick.org>
Fri, 20 Jan 2017 01:11:11 +0000 (20:11 -0500)
committerCristy <urban-warrior@imagemagick.org>
Fri, 20 Jan 2017 01:11:11 +0000 (20:11 -0500)
MagickCore/cache.c
MagickCore/stream.c

index 3e7511567992432373e91f91a7c0955e0cf787aa..a22adb483ed4a0db80533d2b0f1dd2d09f05e9b4 100644 (file)
@@ -4671,7 +4671,9 @@ static inline MagickBooleanType AcquireCacheNexusPixels(
   nexus_info->mapped=MagickFalse;
   nexus_info->cache=(Quantum *) MagickAssumeAligned(AcquireAlignedMemory(1,
     (size_t) nexus_info->length));
-  if (nexus_info->cache == (Quantum *) NULL)
+  if (nexus_info->cache != (Quantum *) NULL)
+    (void) ResetMagickMemory(nexus_info->cache,0,nexus_info->length);
+  else
     {
       nexus_info->mapped=MagickTrue;
       nexus_info->cache=(Quantum *) MapBlob(-1,IOMode,0,(size_t)
index 5d8eefeeacf627102c24dd73c38591f26080abdd..ac2610781715e93c98a4a89ddebe730e52305953 100644 (file)
@@ -568,14 +568,14 @@ MagickPrivate const void *GetStreamInfoClientData(StreamInfo *stream_info)
 %                                                                             %
 %                                                                             %
 %                                                                             %
-+   G e t  V i r t u a l P i x e l s F r o m S t r e a m                      %
++   G e t V i r t u a l P i x e l s F r o m S t r e a m                       %
 %                                                                             %
 %                                                                             %
 %                                                                             %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %
-%  GetVirtualPixelsStream() returns the pixels associated with the last
-%  call to QueueAuthenticPixelsStream() or GetVirtualPixelStream().
+%  GetVirtualPixelsStream() returns the pixels associated with the last call to
+%  QueueAuthenticPixelsStream() or GetVirtualPixelStream().
 %
 %  The format of the GetVirtualPixelsStream() method is:
 %