From: cristy <urban-warrior@git.imagemagick.org>
Date: Thu, 8 Sep 2011 01:11:30 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~7051
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05065f4c09f42c5cd3b5720e5b52c0c3928d2b2b;p=imagemagick

---

diff --git a/Magick++/lib/Blob.cpp b/Magick++/lib/Blob.cpp
index 96b97ec6f..a910d57a2 100644
--- a/Magick++/lib/Blob.cpp
+++ b/Magick++/lib/Blob.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include "Magick++/Blob.h"
 #include "Magick++/BlobRef.h"
diff --git a/Magick++/lib/BlobRef.cpp b/Magick++/lib/BlobRef.cpp
index abc4eec12..dff30b7cd 100644
--- a/Magick++/lib/BlobRef.cpp
+++ b/Magick++/lib/BlobRef.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include "Magick++/Thread.h"
 #include "Magick++/BlobRef.h"
@@ -30,7 +31,7 @@ Magick::BlobRef::BlobRef ( const void* data_,
   if( data_ )
     {
       _data = new unsigned char[length_];
-      MagickCore::memcpy( _data, data_, length_ );
+      memcpy( _data, data_, length_ );
     }
 }
 
diff --git a/Magick++/lib/CoderInfo.cpp b/Magick++/lib/CoderInfo.cpp
index 9d085566f..530b31555 100644
--- a/Magick++/lib/CoderInfo.cpp
+++ b/Magick++/lib/CoderInfo.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION  1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include "Magick++/CoderInfo.h"
 #include "Magick++/Exception.h"
diff --git a/Magick++/lib/Color.cpp b/Magick++/lib/Color.cpp
index 3a8f8b5bf..a4a63e218 100644
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 
diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp
index 082b36a72..77d4a6411 100644
--- a/Magick++/lib/Drawable.cpp
+++ b/Magick++/lib/Drawable.cpp
@@ -9,6 +9,7 @@
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 #define MAGICK_DRAWABLE_IMPLEMENTATION
 
+#include <cstring>
 #include <math.h>
 #include <string>
 #include "Magick++/Include.h"
diff --git a/Magick++/lib/Exception.cpp b/Magick++/lib/Exception.cpp
index d2e872c9f..3b9f9abf9 100644
--- a/Magick++/lib/Exception.cpp
+++ b/Magick++/lib/Exception.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 #include <errno.h>
diff --git a/Magick++/lib/Functions.cpp b/Magick++/lib/Functions.cpp
index 2d3a9d4ed..99184a17d 100644
--- a/Magick++/lib/Functions.cpp
+++ b/Magick++/lib/Functions.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 
diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp
index 09e648375..ae4ac1604 100644
--- a/Magick++/lib/Geometry.cpp
+++ b/Magick++/lib/Geometry.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 #include <ctype.h> // for isdigit
diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index 35a6c3bb4..94664bb13 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -9,6 +9,7 @@
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
 #include <cstdlib>
+#include <cstring>
 #include <string>
 #include <string.h>
 #include <errno.h>
diff --git a/Magick++/lib/ImageRef.cpp b/Magick++/lib/ImageRef.cpp
index c736a8974..e0996c0cb 100644
--- a/Magick++/lib/ImageRef.cpp
+++ b/Magick++/lib/ImageRef.cpp
@@ -10,6 +10,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/ImageRef.h"
 #include "Magick++/Exception.h"
 #include "Magick++/Options.h"
diff --git a/Magick++/lib/Montage.cpp b/Magick++/lib/Montage.cpp
index 23d5efa2b..c44b3e75d 100644
--- a/Magick++/lib/Montage.cpp
+++ b/Magick++/lib/Montage.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string>
 #include <string.h>
diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp
index 1ded7bc7a..c825cca2a 100644
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -10,6 +10,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include <string>
 #include <string.h>
 #include <stdlib.h>
diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp
index 5f755706a..d0e95b6b3 100644
--- a/Magick++/lib/Pixels.cpp
+++ b/Magick++/lib/Pixels.cpp
@@ -8,6 +8,8 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
+#include <cstring>
 #include "Magick++/Include.h"
 #include <string> // This is here to compile with Visual C++
 #include "Magick++/Thread.h"
diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp
index 0a79fcc7f..543a71e65 100644
--- a/Magick++/lib/STL.cpp
+++ b/Magick++/lib/STL.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include <Magick++/Image.h>
 #include <Magick++/STL.h>
 
diff --git a/Magick++/lib/Thread.cpp b/Magick++/lib/Thread.cpp
index 310794cb6..1fa8788c4 100644
--- a/Magick++/lib/Thread.cpp
+++ b/Magick++/lib/Thread.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/Thread.h"
 #include "Magick++/Exception.h"
 
@@ -28,7 +29,7 @@ Magick::MutexLock::MutexLock(void)
         return;
       }
   throwExceptionExplicit( OptionError, "mutex initialization failed",
-                          MagickCore::strerror(sysError) );
+                          strerror(sysError) );
 }
 #else
 #if defined(_VISUALC_) && defined(_MT)
@@ -63,7 +64,7 @@ Magick::MutexLock::~MutexLock(void)
   if ( (sysError = ::pthread_mutex_destroy( &_mutex )) == 0 )
     return;
   throwExceptionExplicit( OptionError, "mutex destruction failed",
-                          MagickCore::strerror(sysError) );
+                          strerror(sysError) );
 #endif
 #if defined(_MT) && defined(_VISUALC_)
   if ( ::CloseHandle(_mutex.id) != 0 )
@@ -80,7 +81,7 @@ void Magick::MutexLock::lock(void)
   if ( (sysError = ::pthread_mutex_lock( &_mutex )) == 0)
     return;
   throwExceptionExplicit( OptionError, "mutex lock failed",
-                          MagickCore::strerror(sysError));
+                          strerror(sysError));
 #endif
 #if defined(_MT) && defined(_VISUALC_)
   if (WaitForSingleObject(_mutex.id,INFINITE) != WAIT_FAILED)
@@ -97,7 +98,7 @@ void Magick::MutexLock::unlock(void)
   if ( (sysError = ::pthread_mutex_unlock( &_mutex )) == 0)
     return;
   throwExceptionExplicit( OptionError, "mutex unlock failed",
-                          MagickCore::strerror(sysError) );
+                          strerror(sysError) );
 #endif
 #if defined(_MT) && defined(_VISUALC_)
   if ( ReleaseSemaphore(_mutex.id, 1, NULL) == TRUE )
diff --git a/Magick++/lib/TypeMetric.cpp b/Magick++/lib/TypeMetric.cpp
index 68d1cec22..dbae23401 100644
--- a/Magick++/lib/TypeMetric.cpp
+++ b/Magick++/lib/TypeMetric.cpp
@@ -8,6 +8,7 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
+#include <cstring>
 #include "Magick++/TypeMetric.h"
 #include <string.h>