(no commit message)

diff --git a/MagickCore/MagickCore.h b/MagickCore/MagickCore.h
index 1cf4ed37434f49f7c096081e85e4cebc8df2ad8a..3fabf692539c5c4d7b1b71a4d944f7536acef27a 100644 (file)
--- a/MagickCore/MagickCore.h
+++ b/MagickCore/MagickCore.h
@@ -55,7 +55,7 @@ extern "C" {
 #  define MAGICKCORE_POSIX_SUPPORT
 #endif 
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB) && !defined(MAGICK_STATIC_LINK)
 #  define _MAGICKDLL_
 # endif
@@ -64,12 +64,20 @@ extern "C" {
 #   pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
 #  endif
 #  if !defined(_MAGICKLIB_)
-#   define MagickExport  __declspec(dllimport)
+#   if defined(__GNUC__)
+#    define MagickExport __attribute__ ((dllimport))
+#   else
+#    define MagickExport __declspec(dllimport)
+#   endif
 #   if defined(_VISUALC_)
 #    pragma message( "Magick lib DLL import interface" )
 #   endif
 #  else
-#   define MagickExport  __declspec(dllexport)
+#   if defined(__GNUC__)
+#    define MagickExport __attribute__ ((dllexport))
+#   else
+#    define MagickExport __declspec(dllexport)
+#   endif
 #   if defined(_VISUALC_)
 #    pragma message( "Magick lib DLL export interface" )
 #   endif
@@ -103,8 +111,14 @@ extern "C" {
 #  pragma warning(disable : 4996)
 # endif
 #else
-# define MagickExport
-# define ModuleExport
+# if __GNUC__ >= 4
+#  define MagickExport __attribute__ ((visibility ("default")))
+#  define MagickPrivate  __attribute__ ((visibility ("hidden")))
+# else
+#   define MagickExport
+#   define MagickPrivate
+# endif
+# define ModuleExport  MagickExport
 # define MagickGlobal
 #endif
 

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 60334d7b94cf6fee05d1743764d535c4bcdb04ab..efe979e75ca7136759a424b1ae1174f741e4cb93 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -436,15 +436,15 @@
 #endif
 
 /* Define if you have the <lcms2.h> header file. */
-/* #undef HAVE_LCMS2_H */
+#ifndef MAGICKCORE_HAVE_LCMS2_H
+#define MAGICKCORE_HAVE_LCMS2_H 1
+#endif
 
 /* Define if you have the <lcms2/lcms2.h> header file. */
 /* #undef HAVE_LCMS2_LCMS2_H */
 
 /* Define if you have the <lcms.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS_H
-#define MAGICKCORE_HAVE_LCMS_H 1
-#endif
+/* #undef HAVE_LCMS_H */
 
 /* Define if you have the <lcms/lcms.h> header file. */
 /* #undef HAVE_LCMS_LCMS_H */
@@ -1167,9 +1167,7 @@
 #endif
 
 /* Define if you have JBIG library */
-#ifndef MAGICKCORE_JBIG_DELEGATE
-#define MAGICKCORE_JBIG_DELEGATE 1
-#endif
+/* #undef JBIG_DELEGATE */
 
 /* Define if you have JPEG version 2 "Jasper" library */
 #ifndef MAGICKCORE_JP2_DELEGATE
@@ -1198,9 +1196,7 @@
 #endif
 
 /* Define if you have LQR library */
-#ifndef MAGICKCORE_LQR_DELEGATE
-#define MAGICKCORE_LQR_DELEGATE 1
-#endif
+/* #undef LQR_DELEGATE */
 
 /* Define if using libltdl to support dynamically loadable modules */
 #ifndef MAGICKCORE_LTDL_DELEGATE
@@ -1212,7 +1208,7 @@
 
 /* Define to the system default library search path. */
 #ifndef MAGICKCORE_LT_DLSEARCH_PATH
-#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/xulrunner-2"
+#define MAGICKCORE_LT_DLSEARCH_PATH "/lib64:/usr/lib64:/lib:/usr/lib:/usr/lib64/R/lib:/usr/lib64/alliance/lib:/usr/lib64/atlas:/opt/modules/pkg/intel/f77/10.0.025/lib:/usr/lib64/kicad:/usr/lib/llvm:/usr/lib64/llvm:/usr/local/lib:/usr/lib64/mpich2/lib/:/usr/lib64/mysql:/usr/lib64/octave/3.4.2:/usr/lib64/openmotif:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
 #endif
 
 /* The archive extension */
@@ -1459,9 +1455,7 @@
 
 
 /* Define if you have WEBP library */
-#ifndef MAGICKCORE_WEBP_DELEGATE
-#define MAGICKCORE_WEBP_DELEGATE 1
-#endif
+/* #undef WEBP_DELEGATE */
 
 /* Define to use the Windows GDI32 library */
 /* #undef WINGDI32_DELEGATE */

diff --git a/MagickCore/module.h b/MagickCore/module.h
index 1f64f11cb571326cd6fc8ae3e1c6b1bc56d99b67..0424168f1d38dd11b83c4409ad882fb458d66cb1 100644 (file)
--- a/MagickCore/module.h
+++ b/MagickCore/module.h
@@ -59,7 +59,7 @@ typedef struct _ModuleInfo
     signature;
 } ModuleInfo;
 
-typedef ModuleExport size_t
+typedef size_t
   ImageFilterHandler(Image **,const int,const char **,ExceptionInfo *);
 
 extern MagickExport char

diff --git a/MagickCore/studio.h b/MagickCore/studio.h
index 1e9bd8afe619b9c7e729a67ae552a89e40048ecb..9751bfc1d8e3e19f4fd1feaf223dfd322e11ccdd 100644 (file)
--- a/MagickCore/studio.h
+++ b/MagickCore/studio.h
@@ -70,7 +70,7 @@ extern "C" {
 #  undef MAGICKCORE_BUILD_MODULES
 #endif
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_
 # endif
@@ -79,12 +79,20 @@ extern "C" {
 #   pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
 #  endif
 #  if !defined(_MAGICKLIB_)
-#   define MagickExport  __declspec(dllimport)
+#   if defined(__GNUC__)
+#    define MagickExport __attribute__ ((dllimport))
+#   else
+#    define MagickExport __declspec(dllimport)
+#   endif
 #   if defined(_VISUALC_)
 #    pragma message( "MagickCore lib DLL import interface" )
 #   endif
 #  else
-#   define MagickExport  __declspec(dllexport)
+#   if defined(__GNUC__)
+#    define MagickExport __attribute__ ((dllexport))
+#   else
+#    define MagickExport __declspec(dllexport)
+#   endif
 #   if defined(_VISUALC_)
 #    pragma message( "MagickCore lib DLL export interface" )
 #   endif
@@ -97,7 +105,11 @@ extern "C" {
 # endif
 
 # if defined(_DLL) && !defined(_LIB)
-#  define ModuleExport  __declspec(dllexport)
+#   if defined(__GNUC__)
+#    define ModuleExport __attribute__ ((dllexport))
+#   else
+#    define ModuleExport __declspec(dllexport)
+#   endif
 #  if defined(_VISUALC_)
 #   pragma message( "MagickCore module DLL export interface" )
 #  endif
@@ -118,9 +130,16 @@ extern "C" {
 #  pragma warning(disable : 4786)
 #  pragma warning(disable : 4996)
 # endif
+# define MagickPrivate
 #else
-# define MagickExport
-# define ModuleExport
+# if __GNUC__ >= 4
+#  define MagickExport __attribute__ ((visibility ("default")))
+#  define MagickPrivate  __attribute__ ((visibility ("hidden")))
+# else
+#   define MagickExport
+#   define MagickPrivate
+# endif
+# define ModuleExport  MagickExport
 # define MagickGlobal
 #endif
 

diff --git a/MagickCore/version.h b/MagickCore/version.h
index ec6c1456034b850d107662dead9a8b82c29420c0..643870c9b886aefdbec9ab506a64e47e86fa5a73 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  5
 #define MagickLibMinInterface  5
-#define MagickReleaseDate  "2011-08-30"
+#define MagickReleaseDate  "2011-08-31"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/MagickWand/MagickWand.h b/MagickWand/MagickWand.h
index 146e51955b5f6511c8f216d9fd093390b621f58f..c079e72df237e7bb58553121476e413120929d76 100644 (file)
--- a/MagickWand/MagickWand.h
+++ b/MagickWand/MagickWand.h
@@ -55,7 +55,7 @@ extern "C" {
 #  define MAGICKCORE_POSIX_SUPPORT
 #endif 
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_
 # endif
@@ -64,12 +64,20 @@ extern "C" {
 #   pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
 #  endif
 #  if !defined(_MAGICKLIB_)
-#   define WandExport  __declspec(dllimport)
+#   if defined(__GNUC__)
+#    define WandExport __attribute__ ((dllimport))
+#   else
+#    define WandExport __declspec(dllimport)
+#   endif
 #   if defined(_VISUALC_)
 #    pragma message( "MagickWand lib DLL import interface" )
 #   endif
 #  else
-#   define WandExport  __declspec(dllexport)
+#   if defined(__GNUC__)
+#    define WandExport __attribute__ ((dllexport))
+#   else
+#    define WandExport __declspec(dllexport)
+#   endif
 #   if defined(_VISUALC_)
 #    pragma message( "MagickWand lib DLL export interface" )
 #   endif
@@ -103,8 +111,13 @@ extern "C" {
 #  pragma warning(disable : 4996)
 # endif
 #else
-# define WandExport
-# define ModuleExport
+# if __GNUC__ >= 4
+#  define WandExport __attribute__ ((visibility ("default")))
+#  define WandPrivate  __attribute__ ((visibility ("hidden")))
+# else
+#   define WandExport
+#   define WandPrivate
+# endif
 # define WandGlobal
 #endif
 

diff --git a/MagickWand/studio.h b/MagickWand/studio.h
index 09aa23bb3b72cb493ed771d76804efe9f39af437..388c077cfadcbb0e7fe0540c66592b23c60984de 100644 (file)
--- a/MagickWand/studio.h
+++ b/MagickWand/studio.h
@@ -64,7 +64,7 @@ extern "C" {
 #  define _MAGICKLIB_
 #endif
 
-#if defined(MAGICKCORE_WINDOWS_SUPPORT) && !defined(__CYGWIN__) && !defined(__MINGW32__)
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
 # if defined(_MT) && defined(_DLL) && !defined(_MAGICKDLL_) && !defined(_LIB)
 #  define _MAGICKDLL_
 # endif
@@ -73,12 +73,20 @@ extern "C" {
 #   pragma warning( disable: 4273 )  /* Disable the dll linkage warnings */
 #  endif
 #  if !defined(_MAGICKLIB_)
-#   define WandExport  __declspec(dllimport)
+#   if defined(__GNUC__)
+#    define WandExport __attribute__ ((dllimport))
+#   else
+#    define WandExport __declspec(dllimport)
+#   endif
 #   if defined(_VISUALC_)
 #    pragma message( "MagickWand lib DLL import interface" )
 #   endif
 #  else
-#   define WandExport  __declspec(dllexport)
+#   if defined(__GNUC__)
+#    define WandExport __attribute__ ((dllexport))
+#   else
+#    define WandExport __declspec(dllexport)
+#   endif
 #   if defined(_VISUALC_)
 #    pragma message( "MagickWand lib DLL export interface" )
 #   endif
@@ -113,8 +121,13 @@ extern "C" {
 #  pragma warning(disable : 4996)
 # endif
 #else
-# define WandExport
-# define ModuleExport
+# if __GNUC__ >= 4
+#  define WandExport __attribute__ ((visibility ("default")))
+#  define WandPrivate  __attribute__ ((visibility ("hidden")))
+# else
+#   define WandExport
+#   define WandPrivate
+# endif
 # define WandGlobal
 #endif