From: Cristy <urban-warrior@imagemagick.org>
Date: Thu, 15 Feb 2018 13:09:08 +0000 (-0500)
Subject: ...
X-Git-Tag: 7.0.7-23~34
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f022bb01c07a8118a139a9c6663da1c844b08818;p=imagemagick

...
---

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index cd16fd07b..bd1a1e633 100644
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -25,6 +25,7 @@
 #include "MagickCore/colorspace.h"
 #include "MagickCore/gem.h"
 #include "MagickCore/image.h"
+#include "MagickCore/memory_.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {
@@ -377,18 +378,12 @@ static inline PixelTrait GetPixelRedTraits(const Image *magick_restrict image)
 static inline void GetPixelInfoPixel(const Image *magick_restrict image,
   const Quantum *magick_restrict pixel,PixelInfo *magick_restrict pixel_info)
 {
+  (void) ResetMagickMemory(pixel_info,0,sizeof(*pixel_info));
   pixel_info->storage_class=DirectClass;
   pixel_info->colorspace=sRGBColorspace;
-  pixel_info->fuzz=0.0f;
   pixel_info->depth=MAGICKCORE_QUANTUM_DEPTH;
-  pixel_info->red=0.0f;
-  pixel_info->green=0.0f;
-  pixel_info->blue=0.0f;
-  pixel_info->black=0.0f;
-  pixel_info->index=0.0f;
   pixel_info->alpha_trait=UndefinedPixelTrait;
   pixel_info->alpha=(MagickRealType) OpaqueAlpha;
-  pixel_info->count=0;
   if (image != (Image *) NULL)
     {
       pixel_info->storage_class=image->storage_class;
diff --git a/MagickCore/pixel.c b/MagickCore/pixel.c
index de90ffa51..253a42d21 100644
--- a/MagickCore/pixel.c
+++ b/MagickCore/pixel.c
@@ -2169,18 +2169,12 @@ MagickExport MagickBooleanType ExportImagePixels(const Image *image,
 */
 MagickExport void GetPixelInfo(const Image *image,PixelInfo *pixel)
 {
+  (void) memset(pixel,0,sizeof(*pixel));
   pixel->storage_class=DirectClass;
   pixel->colorspace=sRGBColorspace;
-  pixel->alpha_trait=UndefinedPixelTrait;
-  pixel->fuzz=0.0;
   pixel->depth=MAGICKCORE_QUANTUM_DEPTH;
-  pixel->red=0.0;
-  pixel->green=0.0;
-  pixel->blue=0.0;
-  pixel->black=0.0;
+  pixel->alpha_trait=UndefinedPixelTrait;
   pixel->alpha=(double) OpaqueAlpha;
-  pixel->index=0.0;
-  pixel->count=0;
   if (image == (const Image *) NULL)
     return;
   pixel->storage_class=image->storage_class;