(no commit message)

diff --git a/Magick++/demo/analyze.cpp b/Magick++/demo/analyze.cpp
index f6d7cd477263ddcf14bd366b48abf75fd6e7ad49..50f82e254c3d0696247c4a9f933e41239bc42428 100644 (file)
--- a/Magick++/demo/analyze.cpp
+++ b/Magick++/demo/analyze.cpp
@@ -7,7 +7,6 @@
 // Usage: analyze file...
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <iostream>
 #include <iomanip>

diff --git a/Magick++/demo/button.cpp b/Magick++/demo/button.cpp
index aca55f1c5de7df5e0da0763ba0cc01f0f2ba8342..118cdfc52d706cc349ec5a1197625a49b85b2714 100644 (file)
--- a/Magick++/demo/button.cpp
+++ b/Magick++/demo/button.cpp
@@ -4,7 +4,6 @@
 // Copyright Bob Friesenhahn, 1999, 2000, 2001, 2003
 // 
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/demo/demo.cpp b/Magick++/demo/demo.cpp
index 0821fecebe6dde6869045618959bc24930f11f1b..1535b676993e2b1e6a737bf1c9e8ca3a32c8236c 100644 (file)
--- a/Magick++/demo/demo.cpp
+++ b/Magick++/demo/demo.cpp
@@ -7,7 +7,6 @@
 // Max run-time size 60MB (as compared with 95MB for PerlMagick) under SPARC Solaris
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/demo/detrans.cpp b/Magick++/demo/detrans.cpp
index 4a88161fc8fae57b8c90bc146419cfac195e58b6..1a515b162db3f8c6be61e08e4e3b3967db005bd8 100644 (file)
--- a/Magick++/demo/detrans.cpp
+++ b/Magick++/demo/detrans.cpp
@@ -10,7 +10,6 @@
 // Usage: detrans color file...
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <iostream>
 using namespace std; 

diff --git a/Magick++/demo/flip.cpp b/Magick++/demo/flip.cpp
index 8ed4ca5bacb57bac11c1925ee127d7d253a9747e..61dae1968bef4da5ab7f15e8f6b6657e1af2111f 100644 (file)
--- a/Magick++/demo/flip.cpp
+++ b/Magick++/demo/flip.cpp
@@ -8,7 +8,6 @@
 // flipped and morphed version to "flip_out.miff".
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/demo/gravity.cpp b/Magick++/demo/gravity.cpp
index 599cf591d1560e372dcdfd7c6021d791f05c0a92..1ae28049120bb0d620669afd4497d44522a51500 100644 (file)
--- a/Magick++/demo/gravity.cpp
+++ b/Magick++/demo/gravity.cpp
@@ -12,7 +12,6 @@
 // by Cristy.
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/demo/piddle.cpp b/Magick++/demo/piddle.cpp
index c23ac21f99f9a04d8c2cd4513fcb37245df63120..ec6007f9f6936806766d5069017d5e0aceeaf0e0 100644 (file)
--- a/Magick++/demo/piddle.cpp
+++ b/Magick++/demo/piddle.cpp
@@ -6,7 +6,6 @@
 // The PerlMagick "piddle" demo is written by John Cristy
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/demo/shapes.cpp b/Magick++/demo/shapes.cpp
index 1357f176fd5fc1460fb7c33c51af3ae669333f62..9dddc5dae6bca3493551a7a9e9cf147d5254eb58 100644 (file)
--- a/Magick++/demo/shapes.cpp
+++ b/Magick++/demo/shapes.cpp
@@ -7,7 +7,6 @@
 // Concept and algorithms lifted from PerlMagick demo script
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/demo/zoom.cpp b/Magick++/demo/zoom.cpp
index b1319e74aceb23f17aa15a04a83b1ae522b53c2d..8db2c8e3d502cad70c4c5d730b2cac4af89e8d5a 100644 (file)
--- a/Magick++/demo/zoom.cpp
+++ b/Magick++/demo/zoom.cpp
@@ -8,7 +8,6 @@
 //             [-resample resolution] input_file output_file
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <iostream>
 #include <string>

diff --git a/Magick++/lib/Blob.cpp b/Magick++/lib/Blob.cpp
index a910d57a2519daed294f75739089bbc57dc4b4f5..96b97ec6f528c8a4ec44c18110ad3087ebe90045 100644 (file)
--- a/Magick++/lib/Blob.cpp
+++ b/Magick++/lib/Blob.cpp
@@ -8,7 +8,6 @@
 #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 dff30b7cd27fae8d168824859b4d35da18b89dfe..d92300fbe6815df3d69b71fe7c60283be3f69ae3 100644 (file)
--- a/Magick++/lib/BlobRef.cpp
+++ b/Magick++/lib/BlobRef.cpp
@@ -8,7 +8,6 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
-#include <cstring>
 #include "Magick++/Include.h"
 #include "Magick++/Thread.h"
 #include "Magick++/BlobRef.h"

diff --git a/Magick++/lib/CoderInfo.cpp b/Magick++/lib/CoderInfo.cpp
index 530b315559e08c1081a1462051546965af07bca8..9d085566f295f48411d6c5bff897604b26c39a2f 100644 (file)
--- a/Magick++/lib/CoderInfo.cpp
+++ b/Magick++/lib/CoderInfo.cpp
@@ -8,7 +8,6 @@
 #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 a4a63e21853fa06225fa6ea569891535113406fa..3a8f8b5bfcc4b104120f254639a34e7b760aac75 100644 (file)
--- a/Magick++/lib/Color.cpp
+++ b/Magick++/lib/Color.cpp
@@ -8,7 +8,6 @@
 #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 77d4a64115b58d25dcf77a0987fd7d43dee77156..082b36a7269dfd149cbb7241c50e6ce83da80b7d 100644 (file)
--- a/Magick++/lib/Drawable.cpp
+++ b/Magick++/lib/Drawable.cpp
@@ -9,7 +9,6 @@
 #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 3b9f9abf9ab02b6c3fadbeaf99c86f7e40923f85..d2e872c9f6dbde3eab77aecd67afa005436db785 100644 (file)
--- a/Magick++/lib/Exception.cpp
+++ b/Magick++/lib/Exception.cpp
@@ -8,7 +8,6 @@
 #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 99184a17d73975f44a732571f0ae6efd7698b8fa..2d3a9d4edc60570f8fdb8fa339d26a11c7bbc301 100644 (file)
--- a/Magick++/lib/Functions.cpp
+++ b/Magick++/lib/Functions.cpp
@@ -8,7 +8,6 @@
 #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 ae4ac16045d277516e450b626354af3283cb2e1e..09e6483754a7a08a34382623357879614eea2a8a 100644 (file)
--- a/Magick++/lib/Geometry.cpp
+++ b/Magick++/lib/Geometry.cpp
@@ -8,7 +8,6 @@
 #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 94664bb1315c62671820077870a6b975a18d5c69..35a6c3bb4f1ad1b750b3fad2ee2f5408b9f02729 100644 (file)
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -9,7 +9,6 @@
 #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 e0996c0cbdeb37c8a32e4243145758f8a0bb4569..c736a897432c4fff7c07ff99cf50b5588df56803 100644 (file)
--- a/Magick++/lib/ImageRef.cpp
+++ b/Magick++/lib/ImageRef.cpp
@@ -10,7 +10,6 @@
 #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/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 1aa226bd2021f6987ee17b34bf0ecf2d94b76f1f..e98d004ca085ff91f2a05856b0772a50a263d170 100644 (file)
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -51,67 +51,63 @@ namespace MagickCore
 #undef class
 }
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+//
+// Provide appropriate DLL imports/exports for Visual C++,
+// Borland C++Builder and MinGW builds.
+//
+#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+# define MagickCplusPlusDLLSupported
+#endif
+#if defined(MagickCplusPlusDLLSupported)
+#  if defined(_MT) && defined(_DLL) && !defined(_LIB) && !defined(STATIC_MAGICK)
+//
+// In a native Windows build, the following defines are used:
+//
+//   _MT         = Multithreaded
+//   _DLL        = Using code is part of a DLL
+//   _LIB        = Using code is being built as a library.
+//   _MAGICKMOD_ = Build uses loadable modules (Magick++ does not care about this)
+//
+// In the case where ImageMagick is built as a static library but the
+// using code is dynamic, STATIC_MAGICK may be defined in the project to
+// override triggering dynamic library behavior.
+//
+# define MagickDLLBuild
 # define MagickPPPrivate
-# if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
-#  define _MAGICKDLL_
-# endif
-# if defined(_MAGICKDLL_)
-#  if defined(_VISUALC_)
-#   pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
-#  endif
-#  if !defined(_MAGICKLIB_)
-#   if defined(__GNUC__)
-#    define MagickPPExport __attribute__ ((dllimport))
-#   else
-#    define MagickPPExport __declspec(dllimport)
-#   endif
-#   if defined(_VISUALC_)
-#    pragma message( "Magick++ lib DLL import interface" )
-#   endif
+#    if defined(_VISUALC_)
+#      pragma warning( disable: 4273 )  /* Disable the stupid dll linkage warnings */
+#      pragma warning( disable: 4251 )
+#    endif
+#    if !defined(MAGICKCORE_IMPLEMENTATION)
+#      if defined(__GNUC__)
+#       define MagickPPExport __attribute__ ((dllimport))
+#      else
+#       define MagickPPExport __declspec(dllimport)
+#      endif
+#      if defined(_VISUALC_)
+#        pragma message( "Magick++ lib DLL import" )
+#      endif
+#    else
+#      if defined(__BORLANDC__)
+#        define MagickPPExport __declspec(dllexport)
+#        pragma message( "BCBMagick++ lib DLL export" )
+#      else
+#        if defined(__GNUC__)
+#         define MagickPPExport __attribute__ ((dllexport))
+#        else
+#         define MagickPPExport __declspec(dllexport)
+#        endif
+#      endif
+#      if defined(_VISUALC_)
+#        pragma message( "Magick++ lib DLL export" )
+#      endif
+#    endif
 #  else
-#   if defined(__GNUC__)
-#    define MagickPPExport __attribute__ ((dllexport))
-#   else
-#    define MagickPPExport __declspec(dllexport)
-#   endif
-#   if defined(_VISUALC_)
-#    pragma message( "Magick++ lib DLL export interface" )
-#   endif
-#  endif
-# else
-#  define MagickPPExport
-#  if defined(_VISUALC_)
-#   pragma message( "Magick++ lib static interface" )
+#    define MagickPPExport
+#    if defined(_VISUALC_)
+#      pragma message( "Magick++ lib static interface" )
+#    endif
 #  endif
-# endif
-
-# if defined(_DLL) && !defined(_LIB)
-#   if defined(__GNUC__)
-#    define ModuleExport __attribute__ ((dllexport))
-#   else
-#    define ModuleExport __declspec(dllexport)
-#   endif
-#  if defined(_VISUALC_)
-#   pragma message( "Magick++ module DLL export interface" )
-#  endif
-# else
-#  define ModuleExport
-#  if defined(_VISUALC_)
-#   pragma message( "Magick++ module static interface" )
-#  endif
-
-# endif
-# define MagickPPGlobal __declspec(thread)
-# if defined(_VISUALC_)
-#  pragma warning(disable : 4018)
-#  pragma warning(disable : 4068)
-#  pragma warning(disable : 4244)
-#  pragma warning(disable : 4142)
-#  pragma warning(disable : 4800)
-#  pragma warning(disable : 4786)
-#  pragma warning(disable : 4996)
-# endif
 #else
 # if __GNUC__ >= 4
 #  define MagickPPExport __attribute__ ((visibility ("default")))
@@ -120,7 +116,10 @@ namespace MagickCore
 #   define MagickPPExport
 #   define MagickPPPrivate
 # endif
-# define MagickPPGlobal
+#endif
+
+#if defined(WIN32) && defined(_VISUALC_)
+#  pragma warning(disable : 4996) /* function deprecation warnings */
 #endif
 
 //
@@ -749,7 +748,10 @@ namespace Magick
   using MagickCore::GetImageQuantizeError;
   using MagickCore::GetImageType;
   using MagickCore::GetMagickInfo;
+  using MagickCore::GetPixelBlue;
+  using MagickCore::GetPixelGreen;
   using MagickCore::GetPixelInfo;
+  using MagickCore::GetPixelRed;
   using MagickCore::GetNumberColors;
   using MagickCore::GetPageGeometry;
   using MagickCore::GetQuantizeInfo;
@@ -873,6 +875,7 @@ namespace Magick
   using MagickCore::SetMagickInfo;
   using MagickCore::SetMagickResourceLimit;
   using MagickCore::SetImageVirtualPixelMethod;
+  using MagickCore::SetPixelChannelMap;
   using MagickCore::SetPixelChannelMask;
   using MagickCore::SetStringInfoDatum;
   using MagickCore::ShadeImage;

diff --git a/Magick++/lib/Montage.cpp b/Magick++/lib/Montage.cpp
index c44b3e75dcb8927f7d8df37b36043fc999912b54..23d5efa2bdbdfa9b74960aaaf632634cc2c4d52d 100644 (file)
--- a/Magick++/lib/Montage.cpp
+++ b/Magick++/lib/Montage.cpp
@@ -8,7 +8,6 @@
 #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 c825cca2a6825d64b03df825b9a015fc1202ea81..1ded7bc7ac90b64615702986b4608ea42fd314d7 100644 (file)
--- a/Magick++/lib/Options.cpp
+++ b/Magick++/lib/Options.cpp
@@ -10,7 +10,6 @@
 #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 d0e95b6b3cc24745083f836f0988c16c5338badd..5a54ce65efbc4359c5fcd5bfe3291b4a0c9718c5 100644 (file)
--- a/Magick++/lib/Pixels.cpp
+++ b/Magick++/lib/Pixels.cpp
@@ -8,7 +8,6 @@
 #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++

diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp
index 543a71e6579c42c83dafe1044fef1184a30dfa3a..0a79fcc7f4f10136930ad45637b24a93996ae153 100644 (file)
--- a/Magick++/lib/STL.cpp
+++ b/Magick++/lib/STL.cpp
@@ -8,7 +8,6 @@
 #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 1fa8788c4777b009e0afd87163169073be735ea7..55a4d8fb66c8e704f420c996020ab9300b9be010 100644 (file)
--- a/Magick++/lib/Thread.cpp
+++ b/Magick++/lib/Thread.cpp
@@ -8,7 +8,6 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
-#include <cstring>
 #include "Magick++/Thread.h"
 #include "Magick++/Exception.h"
 

diff --git a/Magick++/lib/TypeMetric.cpp b/Magick++/lib/TypeMetric.cpp
index dbae23401e8934684ea2ecb1afbafe15e50284b9..68d1cec22cab73ccdd63594ea003fbaf8aac6b59 100644 (file)
--- a/Magick++/lib/TypeMetric.cpp
+++ b/Magick++/lib/TypeMetric.cpp
@@ -8,7 +8,6 @@
 #define MAGICKCORE_IMPLEMENTATION  1
 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1
 
-#include <cstring>
 #include "Magick++/TypeMetric.h"
 #include <string.h>
 

diff --git a/Magick++/tests/appendImages.cpp b/Magick++/tests/appendImages.cpp
index 5e269bedc58b84b79c5a7eb1a43aec49f86776b3..8ad480c8afe7f898e040c13b6dcd28f83ce838a7 100644 (file)
--- a/Magick++/tests/appendImages.cpp
+++ b/Magick++/tests/appendImages.cpp
@@ -5,7 +5,6 @@
 // Test STL appendImages function
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp
index ea7c03db264a725bf15e6c75066b66b31bee39e7..6368ad5e27ec8ed15af590bfba9ab7136fc4331c 100644 (file)
--- a/Magick++/tests/attributes.cpp
+++ b/Magick++/tests/attributes.cpp
@@ -5,7 +5,6 @@
 // Tests for setting/getting Magick::Image attributes
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/averageImages.cpp b/Magick++/tests/averageImages.cpp
index b646e6597f80c208315a08cece09c8048070a558..0c94ee8d364d5f7cef00028a0becfb577f77be80 100644 (file)
--- a/Magick++/tests/averageImages.cpp
+++ b/Magick++/tests/averageImages.cpp
@@ -5,7 +5,6 @@
 // Test STL averageImages function
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/coalesceImages.cpp b/Magick++/tests/coalesceImages.cpp
index 7a933e02f2655d0e11ab5e0d6f20ea4d72e62d78..4db76f9df727e036fdd48d89bd080891f5ded384 100644 (file)
--- a/Magick++/tests/coalesceImages.cpp
+++ b/Magick++/tests/coalesceImages.cpp
@@ -5,7 +5,6 @@
 // Test STL coalesceImages function
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/coderInfo.cpp b/Magick++/tests/coderInfo.cpp
index 7fb3baa84c64f9b963ebed03404acf4c5123f374..e5c5df0bd7e438947d50098d4de1628a5da39e86 100644 (file)
--- a/Magick++/tests/coderInfo.cpp
+++ b/Magick++/tests/coderInfo.cpp
@@ -5,7 +5,6 @@
 // Test Magick::CoderInfo class and Magick::coderInfoList
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/color.cpp b/Magick++/tests/color.cpp
index 4b74f39fd92834d95ede72fea22d2fd13760e35d..0ce2ebc00d7fde64520eb330ee24407a1beaff4d 100644 (file)
--- a/Magick++/tests/color.cpp
+++ b/Magick++/tests/color.cpp
@@ -5,7 +5,6 @@
 // Test Magick::Color classes
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/colorHistogram.cpp b/Magick++/tests/colorHistogram.cpp
index 65bb271b0f6ceac1ae0d9e113a29c989c396c0fe..4418eacc9a13c639a0efb4dc3e4670a0bb88e59a 100644 (file)
--- a/Magick++/tests/colorHistogram.cpp
+++ b/Magick++/tests/colorHistogram.cpp
@@ -8,7 +8,6 @@
 #undef USE_VECTOR
 #define USE_MAP
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/exceptions.cpp b/Magick++/tests/exceptions.cpp
index 4aa4188aefed0206606f246143534caf9397f945..cab3177ddeae03f5fd5395584b8fef7cef613531 100644 (file)
--- a/Magick++/tests/exceptions.cpp
+++ b/Magick++/tests/exceptions.cpp
@@ -5,7 +5,6 @@
 // Tests for throwing exceptions
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/montageImages.cpp b/Magick++/tests/montageImages.cpp
index a9f6db7f6b7fe11aa12ad751c31e9d3b738aabb3..482f14b62c21e00f9bca537e32516c9a38576370 100644 (file)
--- a/Magick++/tests/montageImages.cpp
+++ b/Magick++/tests/montageImages.cpp
@@ -5,7 +5,6 @@
 // Test STL montageImages function
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/morphImages.cpp b/Magick++/tests/morphImages.cpp
index 26e42e7d61d3d0e2dae198807e1664a115731934..00a0c82497ce758775c04057f092b665e3f6d76a 100644 (file)
--- a/Magick++/tests/morphImages.cpp
+++ b/Magick++/tests/morphImages.cpp
@@ -5,7 +5,6 @@
 // Test STL morphImages function
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/readWriteBlob.cpp b/Magick++/tests/readWriteBlob.cpp
index 552505100ccd8e13fd02ce80caed43049de576e0..a15f046b62c64fca9775d299f68ce8d37cff4d1a 100644 (file)
--- a/Magick++/tests/readWriteBlob.cpp
+++ b/Magick++/tests/readWriteBlob.cpp
@@ -5,7 +5,6 @@
 // Test reading/writing BLOBs using Magick++
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/Magick++/tests/readWriteImages.cpp b/Magick++/tests/readWriteImages.cpp
index 626d284fbf750a29a439c76b2639278917648adf..7af711a2a597fbf8458f536780ccd9e70e9fe70a 100644 (file)
--- a/Magick++/tests/readWriteImages.cpp
+++ b/Magick++/tests/readWriteImages.cpp
@@ -5,7 +5,6 @@
 // Test STL readImages and writeImages functions
 //
 
-#include <cstring>
 #include <Magick++.h>
 #include <string>
 #include <iostream>

diff --git a/MagickCore/animate-private.h b/MagickCore/animate-private.h
index 22ceedae63718b888a04252972951467ef0f8c92..7ca17ac3abf1e22b221ac8843f2fd89b1a7554c6 100644 (file)
--- a/MagickCore/animate-private.h
+++ b/MagickCore/animate-private.h
@@ -22,6 +22,17 @@
 extern "C" {
 #endif
 
+#if defined(MAGICKCORE_X11_DELEGATE)
+#include "MagickCore/xwindow-private.h"
+
+extern MagickExport Image
+  *XAnimateImages(Display *,XResourceInfo *,char **,const int,Image *,
+    ExceptionInfo *);
+
+extern MagickExport void
+  XAnimateBackgroundImage(Display *,XResourceInfo *,Image *,ExceptionInfo *);
+#endif
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/animate.h b/MagickCore/animate.h
index d0fa748630ac5ab729f228006ab378566ba9c833..54e2119a1e4746c1b787c3b31fefa65c167a510b 100644 (file)
--- a/MagickCore/animate.h
+++ b/MagickCore/animate.h
@@ -25,17 +25,6 @@ extern "C" {
 extern MagickExport MagickBooleanType
   AnimateImages(const ImageInfo *,Image *,ExceptionInfo *);
 
-#if defined(MAGICKCORE_X11_DELEGATE)
-#include "MagickCore/xwindow.h"
-
-extern MagickExport Image
-  *XAnimateImages(Display *,XResourceInfo *,char **,const int,Image *,
-    ExceptionInfo *);
-
-extern MagickExport void
-  XAnimateBackgroundImage(Display *,XResourceInfo *,Image *,ExceptionInfo *);
-#endif
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/display-private.h b/MagickCore/display-private.h
index 28bb63afedc7305193bdffccd7f3a00dbc981578..a5b74d20bc717a3502903e0f045cc68ac81358e6 100644 (file)
--- a/MagickCore/display-private.h
+++ b/MagickCore/display-private.h
@@ -22,6 +22,17 @@
 extern "C" {
 #endif
 
+#if defined(MAGICKCORE_X11_DELEGATE)
+#include "MagickCore/xwindow-private.h"
+
+extern MagickExport Image
+  *XDisplayImage(Display *,XResourceInfo *,char **,int,Image **,size_t *,
+    ExceptionInfo *);
+
+extern MagickExport MagickBooleanType XDisplayBackgroundImage(Display *,
+  XResourceInfo *,Image *,ExceptionInfo *);
+#endif
+
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/display.h b/MagickCore/display.h
index 93492ef291c63d8bf7d0034e0c7ed6cdd76fe1ec..b4710b3516d5c2aa3da2ab0f621b08bde325a0f8 100644 (file)
--- a/MagickCore/display.h
+++ b/MagickCore/display.h
@@ -27,17 +27,6 @@ extern MagickExport MagickBooleanType
   RemoteDisplayCommand(const ImageInfo *,const char *,const char *,
     ExceptionInfo *);
 
-#if defined(MAGICKCORE_X11_DELEGATE)
-#include "MagickCore/xwindow.h"
-
-extern MagickExport Image
-  *XDisplayImage(Display *,XResourceInfo *,char **,int,Image **,size_t *,
-    ExceptionInfo *);
-
-extern MagickExport MagickBooleanType XDisplayBackgroundImage(Display *,
-  XResourceInfo *,Image *,ExceptionInfo *);
-#endif
-
 #if defined(__cplusplus) || defined(c_plusplus)
 }
 #endif

diff --git a/MagickCore/xwindow-private.h b/MagickCore/xwindow-private.h
index 400a7d2dd9181d73a7f60df195242db04cded5b2..71b911a0a6b0bbf9665136178cfbfbd8fd934286 100644 (file)
--- a/MagickCore/xwindow-private.h
+++ b/MagickCore/xwindow-private.h
@@ -34,7 +34,6 @@ extern "C" {
 #include "MagickCore/exception.h"
 #include "MagickCore/geometry.h"
 #include "MagickCore/quantize.h"
-#include "MagickCore/xwindow.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 # define klass  c_class
@@ -162,16 +161,6 @@ typedef struct _XDrawInfo
     geometry[MaxTextExtent];
 } XDrawInfo;
 
-struct _XImportInfo
-{
-  MagickBooleanType
-    frame,
-    borders,
-    screen,
-    descend,
-    silent;
-};
-
 typedef enum
 {
   DefaultState = 0x0000,
@@ -248,7 +237,7 @@ typedef struct _XPixelInfo
     pen_index;
 } XPixelInfo;
 
-struct _XResourceInfo
+typedef struct _XResourceInfo
 {
   XrmDatabase
     resource_database;
@@ -352,7 +341,7 @@ struct _XResourceInfo
 
   char
     home_directory[MaxTextExtent];
-};
+} XResourceInfo;
 
 typedef struct _XWindowInfo
 {
@@ -583,6 +572,26 @@ extern MagickPrivate XWindows
   *XInitializeWindows(Display *,XResourceInfo *),
   *XSetWindows(XWindows *);
 
+extern MagickExport char
+  *XGetResourceClass(XrmDatabase,const char *,const char *,char *),
+  *XGetResourceInstance(XrmDatabase,const char *,const char *,const char *),
+  *XGetScreenDensity(Display *);
+
+extern MagickExport int
+  XError(Display *,XErrorEvent *);
+
+extern MagickExport MagickBooleanType
+  XRemoteCommand(Display *,const char *,const char *);
+
+extern MagickExport void
+  DestroyXResources(void),
+  XDestroyResourceInfo(XResourceInfo *),
+  XGetResourceInfo(const ImageInfo *,XrmDatabase,const char *,XResourceInfo *),
+  XRetainWindowColors(Display *,const Window);
+
+extern MagickExport XrmDatabase
+  XGetResourceDatabase(Display *,const char *);
+
 static inline MagickRealType XPixelIntensity(const XColor *pixel)
 {
   MagickRealType

diff --git a/MagickCore/xwindow.h b/MagickCore/xwindow.h
index 265a06c08e92c14579a0fe066206384adacfa7f9..928b63718e66918e4e898ead62432ba37f591a37 100644 (file)
--- a/MagickCore/xwindow.h
+++ b/MagickCore/xwindow.h
@@ -22,42 +22,20 @@
 extern "C" {
 #endif
 
-#if defined(MAGICKCORE_X11_DELEGATE)
-#include <X11/Xos.h>
-#include <X11/Xlib.h>
-#include <X11/Xresource.h>
-
 typedef struct _XImportInfo
-  XImportInfo;
-
-typedef struct _XResourceInfo
-  XResourceInfo;
-
-extern MagickExport char
-  *XGetResourceClass(XrmDatabase,const char *,const char *,char *),
-  *XGetResourceInstance(XrmDatabase,const char *,const char *,const char *),
-  *XGetScreenDensity(Display *);
-
-extern MagickExport int
-  XError(Display *,XErrorEvent *);
-
-extern MagickExport XrmDatabase
-  XGetResourceDatabase(Display *,const char *);
-
-extern MagickExport void
-  XGetResourceInfo(const ImageInfo *,XrmDatabase,const char *,XResourceInfo *),
-  XRetainWindowColors(Display *,const Window);
-#endif
+{
+  MagickBooleanType
+    frame,
+    borders,
+    screen,
+    descend,
+    silent;
+} XImportInfo;
 
 extern MagickExport Image
   *XImportImage(const ImageInfo *,XImportInfo *);
 
-extern MagickExport MagickBooleanType
-  XRemoteCommand(Display *,const char *,const char *);
-
 extern MagickExport void
-  DestroyXResources(void),
-  XDestroyResourceInfo(XResourceInfo *),
   XGetImportInfo(XImportInfo *);
 
 #if defined(__cplusplus) || defined(c_plusplus)