From: cristy Date: Thu, 8 Sep 2011 18:21:13 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~7042 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3099b7aaccf9c581c3cf06c32738e214dba7a9c;p=imagemagick --- diff --git a/Magick++/demo/analyze.cpp b/Magick++/demo/analyze.cpp index f6d7cd477..50f82e254 100644 --- a/Magick++/demo/analyze.cpp +++ b/Magick++/demo/analyze.cpp @@ -7,7 +7,6 @@ // Usage: analyze file... // -#include #include #include #include diff --git a/Magick++/demo/button.cpp b/Magick++/demo/button.cpp index aca55f1c5..118cdfc52 100644 --- a/Magick++/demo/button.cpp +++ b/Magick++/demo/button.cpp @@ -4,7 +4,6 @@ // Copyright Bob Friesenhahn, 1999, 2000, 2001, 2003 // -#include #include #include #include diff --git a/Magick++/demo/demo.cpp b/Magick++/demo/demo.cpp index 0821feceb..1535b6769 100644 --- 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 #include #include #include diff --git a/Magick++/demo/detrans.cpp b/Magick++/demo/detrans.cpp index 4a88161fc..1a515b162 100644 --- a/Magick++/demo/detrans.cpp +++ b/Magick++/demo/detrans.cpp @@ -10,7 +10,6 @@ // Usage: detrans color file... // -#include #include #include using namespace std; diff --git a/Magick++/demo/flip.cpp b/Magick++/demo/flip.cpp index 8ed4ca5ba..61dae1968 100644 --- a/Magick++/demo/flip.cpp +++ b/Magick++/demo/flip.cpp @@ -8,7 +8,6 @@ // flipped and morphed version to "flip_out.miff". // -#include #include #include #include diff --git a/Magick++/demo/gravity.cpp b/Magick++/demo/gravity.cpp index 599cf591d..1ae280491 100644 --- a/Magick++/demo/gravity.cpp +++ b/Magick++/demo/gravity.cpp @@ -12,7 +12,6 @@ // by Cristy. // -#include #include #include #include diff --git a/Magick++/demo/piddle.cpp b/Magick++/demo/piddle.cpp index c23ac21f9..ec6007f9f 100644 --- a/Magick++/demo/piddle.cpp +++ b/Magick++/demo/piddle.cpp @@ -6,7 +6,6 @@ // The PerlMagick "piddle" demo is written by John Cristy // -#include #include #include #include diff --git a/Magick++/demo/shapes.cpp b/Magick++/demo/shapes.cpp index 1357f176f..9dddc5dae 100644 --- a/Magick++/demo/shapes.cpp +++ b/Magick++/demo/shapes.cpp @@ -7,7 +7,6 @@ // Concept and algorithms lifted from PerlMagick demo script // -#include #include #include #include diff --git a/Magick++/demo/zoom.cpp b/Magick++/demo/zoom.cpp index b1319e74a..8db2c8e3d 100644 --- a/Magick++/demo/zoom.cpp +++ b/Magick++/demo/zoom.cpp @@ -8,7 +8,6 @@ // [-resample resolution] input_file output_file // -#include #include #include #include diff --git a/Magick++/lib/Blob.cpp b/Magick++/lib/Blob.cpp index a910d57a2..96b97ec6f 100644 --- a/Magick++/lib/Blob.cpp +++ b/Magick++/lib/Blob.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #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 dff30b7cd..d92300fbe 100644 --- a/Magick++/lib/BlobRef.cpp +++ b/Magick++/lib/BlobRef.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #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 530b31555..9d085566f 100644 --- a/Magick++/lib/CoderInfo.cpp +++ b/Magick++/lib/CoderInfo.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #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 a4a63e218..3a8f8b5bf 100644 --- a/Magick++/lib/Color.cpp +++ b/Magick++/lib/Color.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include "Magick++/Include.h" #include diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp index 77d4a6411..082b36a72 100644 --- a/Magick++/lib/Drawable.cpp +++ b/Magick++/lib/Drawable.cpp @@ -9,7 +9,6 @@ #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 #define MAGICK_DRAWABLE_IMPLEMENTATION -#include #include #include #include "Magick++/Include.h" diff --git a/Magick++/lib/Exception.cpp b/Magick++/lib/Exception.cpp index 3b9f9abf9..d2e872c9f 100644 --- a/Magick++/lib/Exception.cpp +++ b/Magick++/lib/Exception.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include "Magick++/Include.h" #include #include diff --git a/Magick++/lib/Functions.cpp b/Magick++/lib/Functions.cpp index 99184a17d..2d3a9d4ed 100644 --- a/Magick++/lib/Functions.cpp +++ b/Magick++/lib/Functions.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include "Magick++/Include.h" #include diff --git a/Magick++/lib/Geometry.cpp b/Magick++/lib/Geometry.cpp index ae4ac1604..09e648375 100644 --- a/Magick++/lib/Geometry.cpp +++ b/Magick++/lib/Geometry.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include "Magick++/Include.h" #include #include // for isdigit diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp index 94664bb13..35a6c3bb4 100644 --- a/Magick++/lib/Image.cpp +++ b/Magick++/lib/Image.cpp @@ -9,7 +9,6 @@ #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 #include -#include #include #include #include diff --git a/Magick++/lib/ImageRef.cpp b/Magick++/lib/ImageRef.cpp index e0996c0cb..c736a8974 100644 --- a/Magick++/lib/ImageRef.cpp +++ b/Magick++/lib/ImageRef.cpp @@ -10,7 +10,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #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 1aa226bd2..e98d004ca 100644 --- 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 c44b3e75d..23d5efa2b 100644 --- a/Magick++/lib/Montage.cpp +++ b/Magick++/lib/Montage.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include "Magick++/Include.h" #include #include diff --git a/Magick++/lib/Options.cpp b/Magick++/lib/Options.cpp index c825cca2a..1ded7bc7a 100644 --- a/Magick++/lib/Options.cpp +++ b/Magick++/lib/Options.cpp @@ -10,7 +10,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include #include #include diff --git a/Magick++/lib/Pixels.cpp b/Magick++/lib/Pixels.cpp index d0e95b6b3..5a54ce65e 100644 --- a/Magick++/lib/Pixels.cpp +++ b/Magick++/lib/Pixels.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include #include "Magick++/Include.h" #include // This is here to compile with Visual C++ diff --git a/Magick++/lib/STL.cpp b/Magick++/lib/STL.cpp index 543a71e65..0a79fcc7f 100644 --- a/Magick++/lib/STL.cpp +++ b/Magick++/lib/STL.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include #include diff --git a/Magick++/lib/Thread.cpp b/Magick++/lib/Thread.cpp index 1fa8788c4..55a4d8fb6 100644 --- a/Magick++/lib/Thread.cpp +++ b/Magick++/lib/Thread.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include "Magick++/Thread.h" #include "Magick++/Exception.h" diff --git a/Magick++/lib/TypeMetric.cpp b/Magick++/lib/TypeMetric.cpp index dbae23401..68d1cec22 100644 --- a/Magick++/lib/TypeMetric.cpp +++ b/Magick++/lib/TypeMetric.cpp @@ -8,7 +8,6 @@ #define MAGICKCORE_IMPLEMENTATION 1 #define MAGICK_PLUSPLUS_IMPLEMENTATION 1 -#include #include "Magick++/TypeMetric.h" #include diff --git a/Magick++/tests/appendImages.cpp b/Magick++/tests/appendImages.cpp index 5e269bedc..8ad480c8a 100644 --- a/Magick++/tests/appendImages.cpp +++ b/Magick++/tests/appendImages.cpp @@ -5,7 +5,6 @@ // Test STL appendImages function // -#include #include #include #include diff --git a/Magick++/tests/attributes.cpp b/Magick++/tests/attributes.cpp index ea7c03db2..6368ad5e2 100644 --- a/Magick++/tests/attributes.cpp +++ b/Magick++/tests/attributes.cpp @@ -5,7 +5,6 @@ // Tests for setting/getting Magick::Image attributes // -#include #include #include #include diff --git a/Magick++/tests/averageImages.cpp b/Magick++/tests/averageImages.cpp index b646e6597..0c94ee8d3 100644 --- a/Magick++/tests/averageImages.cpp +++ b/Magick++/tests/averageImages.cpp @@ -5,7 +5,6 @@ // Test STL averageImages function // -#include #include #include #include diff --git a/Magick++/tests/coalesceImages.cpp b/Magick++/tests/coalesceImages.cpp index 7a933e02f..4db76f9df 100644 --- a/Magick++/tests/coalesceImages.cpp +++ b/Magick++/tests/coalesceImages.cpp @@ -5,7 +5,6 @@ // Test STL coalesceImages function // -#include #include #include #include diff --git a/Magick++/tests/coderInfo.cpp b/Magick++/tests/coderInfo.cpp index 7fb3baa84..e5c5df0bd 100644 --- a/Magick++/tests/coderInfo.cpp +++ b/Magick++/tests/coderInfo.cpp @@ -5,7 +5,6 @@ // Test Magick::CoderInfo class and Magick::coderInfoList // -#include #include #include #include diff --git a/Magick++/tests/color.cpp b/Magick++/tests/color.cpp index 4b74f39fd..0ce2ebc00 100644 --- a/Magick++/tests/color.cpp +++ b/Magick++/tests/color.cpp @@ -5,7 +5,6 @@ // Test Magick::Color classes // -#include #include #include #include diff --git a/Magick++/tests/colorHistogram.cpp b/Magick++/tests/colorHistogram.cpp index 65bb271b0..4418eacc9 100644 --- a/Magick++/tests/colorHistogram.cpp +++ b/Magick++/tests/colorHistogram.cpp @@ -8,7 +8,6 @@ #undef USE_VECTOR #define USE_MAP -#include #include #include #include diff --git a/Magick++/tests/exceptions.cpp b/Magick++/tests/exceptions.cpp index 4aa4188ae..cab3177dd 100644 --- a/Magick++/tests/exceptions.cpp +++ b/Magick++/tests/exceptions.cpp @@ -5,7 +5,6 @@ // Tests for throwing exceptions // -#include #include #include #include diff --git a/Magick++/tests/montageImages.cpp b/Magick++/tests/montageImages.cpp index a9f6db7f6..482f14b62 100644 --- a/Magick++/tests/montageImages.cpp +++ b/Magick++/tests/montageImages.cpp @@ -5,7 +5,6 @@ // Test STL montageImages function // -#include #include #include #include diff --git a/Magick++/tests/morphImages.cpp b/Magick++/tests/morphImages.cpp index 26e42e7d6..00a0c8249 100644 --- a/Magick++/tests/morphImages.cpp +++ b/Magick++/tests/morphImages.cpp @@ -5,7 +5,6 @@ // Test STL morphImages function // -#include #include #include #include diff --git a/Magick++/tests/readWriteBlob.cpp b/Magick++/tests/readWriteBlob.cpp index 552505100..a15f046b6 100644 --- a/Magick++/tests/readWriteBlob.cpp +++ b/Magick++/tests/readWriteBlob.cpp @@ -5,7 +5,6 @@ // Test reading/writing BLOBs using Magick++ // -#include #include #include #include diff --git a/Magick++/tests/readWriteImages.cpp b/Magick++/tests/readWriteImages.cpp index 626d284fb..7af711a2a 100644 --- a/Magick++/tests/readWriteImages.cpp +++ b/Magick++/tests/readWriteImages.cpp @@ -5,7 +5,6 @@ // Test STL readImages and writeImages functions // -#include #include #include #include diff --git a/MagickCore/animate-private.h b/MagickCore/animate-private.h index 22ceedae6..7ca17ac3a 100644 --- 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 d0fa74863..54e2119a1 100644 --- 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 28bb63afe..a5b74d20b 100644 --- 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 93492ef29..b4710b351 100644 --- 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 400a7d2dd..71b911a0a 100644 --- 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 265a06c08..928b63718 100644 --- a/MagickCore/xwindow.h +++ b/MagickCore/xwindow.h @@ -22,42 +22,20 @@ extern "C" { #endif -#if defined(MAGICKCORE_X11_DELEGATE) -#include -#include -#include - 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)