Use memset instead of ResetMagickMemory.

diff --git a/Magick++/lib/Montage.cpp b/Magick++/lib/Montage.cpp
index f82367e498d4637acf520e04e1cf12e587567909..33bf0ce07f995a3360a0c8d96fe82601e7e210d1 100644 (file)
--- a/Magick++/lib/Montage.cpp
+++ b/Magick++/lib/Montage.cpp
@@ -179,7 +179,7 @@ Magick::Color Magick::Montage::transparentColor(void) const
 
 void Magick::Montage::updateMontageInfo(MontageInfo &montageInfo_ ) const
 {
-  (void) MagickCore::ResetMagickMemory(&montageInfo_,0,sizeof(montageInfo_));
+  (void) memset(&montageInfo_,0,sizeof(montageInfo_));
 
   // matte_color
   montageInfo_.matte_color=Color();

diff --git a/Magick++/lib/TypeMetric.cpp b/Magick++/lib/TypeMetric.cpp
index a435e3c4514fc74f602d75b57b752cf00e05ddac..2d8e29b65f4ca107db53ee92416bb3b7f555b3f9 100644 (file)
--- a/Magick++/lib/TypeMetric.cpp
+++ b/Magick++/lib/TypeMetric.cpp
@@ -14,7 +14,7 @@
 
 Magick::TypeMetric::TypeMetric(void)
 {
-  ResetMagickMemory(&_typeMetric,0,sizeof(_typeMetric));
+  memset(&_typeMetric,0,sizeof(_typeMetric));
 }
 
 Magick::TypeMetric::~TypeMetric(void)

diff --git a/MagickCore/pixel-accessor.h b/MagickCore/pixel-accessor.h
index bd1a1e6338e9720c2fdc30ac51a3d9e0d483db2c..fe9cf8e9913558428151916c0b3422357b9d8a9c 100644 (file)
--- a/MagickCore/pixel-accessor.h
+++ b/MagickCore/pixel-accessor.h
@@ -378,7 +378,7 @@ 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));
+  (void) memset(pixel_info,0,sizeof(*pixel_info));
   pixel_info->storage_class=DirectClass;
   pixel_info->colorspace=sRGBColorspace;
   pixel_info->depth=MAGICKCORE_QUANTUM_DEPTH;

diff --git a/MagickCore/random-private.h b/MagickCore/random-private.h
index 125d767fda762899beccf12b5cc7228bcc9c1ac0..53599c3e9380989148d87a1107c0a98bb2193eb8 100644 (file)
--- a/MagickCore/random-private.h
+++ b/MagickCore/random-private.h
@@ -65,7 +65,7 @@ static inline RandomInfo **AcquireRandomInfoThreadSet(void)
     sizeof(*random_info));
   if (random_info == (RandomInfo **) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-  (void) ResetMagickMemory(random_info,0,number_threads*sizeof(*random_info));
+  (void) memset(random_info,0,number_threads*sizeof(*random_info));
   for (i=0; i < (ssize_t) number_threads; i++)
     random_info[i]=AcquireRandomInfo();
   return(random_info);

diff --git a/MagickCore/resample-private.h b/MagickCore/resample-private.h
index 2f9175776d6ce9371ef4a8b28829f810c84092c0..6d71a3c22d7c68e5ee3f2d833e3d80c242bda623 100644 (file)
--- a/MagickCore/resample-private.h
+++ b/MagickCore/resample-private.h
@@ -56,7 +56,7 @@ static inline ResampleFilter **AcquireResampleFilterThreadSet(
     sizeof(*filter));
   if (filter == (ResampleFilter **) NULL)
     ThrowFatalException(ResourceLimitFatalError,"MemoryAllocationFailed");
-  (void) ResetMagickMemory(filter,0,number_threads*sizeof(*filter));
+  (void) memset(filter,0,number_threads*sizeof(*filter));
   for (i=0; i < (ssize_t) number_threads; i++)
   {
     filter[i]=AcquireResampleFilter(image,exception);