diff --git a/Magick++/lib/Drawable.cpp b/Magick++/lib/Drawable.cpp
index 5484032..082b36a 100644
--- a/Magick++/lib/Drawable.cpp
+++ b/Magick++/lib/Drawable.cpp
@@ -18,34 +18,34 @@
using namespace std;
-MagickDLLDecl int Magick::operator == ( const Magick::Coordinate& left_,
+MagickPPExport int Magick::operator == ( const Magick::Coordinate& left_,
const Magick::Coordinate& right_ )
{
return ( ( left_.x() == right_.x() ) && ( left_.y() == right_.y() ) );
}
-MagickDLLDecl int Magick::operator != ( const Magick::Coordinate& left_,
+MagickPPExport int Magick::operator != ( const Magick::Coordinate& left_,
const Magick::Coordinate& right_ )
{
return ( ! (left_ == right_) );
}
-MagickDLLDecl int Magick::operator > ( const Magick::Coordinate& left_,
+MagickPPExport int Magick::operator > ( const Magick::Coordinate& left_,
const Magick::Coordinate& right_ )
{
return ( !( left_ < right_ ) && ( left_ != right_ ) );
}
-MagickDLLDecl int Magick::operator < ( const Magick::Coordinate& left_,
+MagickPPExport int Magick::operator < ( const Magick::Coordinate& left_,
const Magick::Coordinate& right_ )
{
// Based on distance from origin
return ( (sqrt(left_.x()*left_.x() + left_.y()*left_.y())) <
(sqrt(right_.x()*right_.x() + right_.y()*right_.y())) );
}
-MagickDLLDecl int Magick::operator >= ( const Magick::Coordinate& left_,
+MagickPPExport int Magick::operator >= ( const Magick::Coordinate& left_,
const Magick::Coordinate& right_ )
{
return ( ( left_ > right_ ) || ( left_ == right_ ) );
}
-MagickDLLDecl int Magick::operator <= ( const Magick::Coordinate& left_,
+MagickPPExport int Magick::operator <= ( const Magick::Coordinate& left_,
const Magick::Coordinate& right_ )
{
return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -100,32 +100,32 @@
dp->operator()( context_ );
}
-MagickDLLDecl int Magick::operator == ( const Magick::Drawable& /*left_*/,
+MagickPPExport int Magick::operator == ( const Magick::Drawable& /*left_*/,
const Magick::Drawable& /*right_*/ )
{
return ( 1 );
}
-MagickDLLDecl int Magick::operator != ( const Magick::Drawable& /*left_*/,
+MagickPPExport int Magick::operator != ( const Magick::Drawable& /*left_*/,
const Magick::Drawable& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator > ( const Magick::Drawable& /*left_*/,
+MagickPPExport int Magick::operator > ( const Magick::Drawable& /*left_*/,
const Magick::Drawable& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator < ( const Magick::Drawable& /*left_*/,
+MagickPPExport int Magick::operator < ( const Magick::Drawable& /*left_*/,
const Magick::Drawable& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator >= ( const Magick::Drawable& left_,
+MagickPPExport int Magick::operator >= ( const Magick::Drawable& left_,
const Magick::Drawable& right_ )
{
return ( ( left_ > right_ ) || ( left_ == right_ ) );
}
-MagickDLLDecl int Magick::operator <= ( const Magick::Drawable& left_,
+MagickPPExport int Magick::operator <= ( const Magick::Drawable& left_,
const Magick::Drawable& right_ )
{
return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -180,32 +180,32 @@
dp->operator()( context_ );
}
-MagickDLLDecl int Magick::operator == ( const Magick::VPath& /*left_*/,
+MagickPPExport int Magick::operator == ( const Magick::VPath& /*left_*/,
const Magick::VPath& /*right_*/ )
{
return ( 1 );
}
-MagickDLLDecl int Magick::operator != ( const Magick::VPath& /*left_*/,
+MagickPPExport int Magick::operator != ( const Magick::VPath& /*left_*/,
const Magick::VPath& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator > ( const Magick::VPath& /*left_*/,
+MagickPPExport int Magick::operator > ( const Magick::VPath& /*left_*/,
const Magick::VPath& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator < ( const Magick::VPath& /*left_*/,
+MagickPPExport int Magick::operator < ( const Magick::VPath& /*left_*/,
const Magick::VPath& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator >= ( const Magick::VPath& left_,
+MagickPPExport int Magick::operator >= ( const Magick::VPath& left_,
const Magick::VPath& right_ )
{
return ( ( left_ > right_ ) || ( left_ == right_ ) );
}
-MagickDLLDecl int Magick::operator <= ( const Magick::VPath& left_,
+MagickPPExport int Magick::operator <= ( const Magick::VPath& left_,
const Magick::VPath& right_ )
{
return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -1402,32 +1402,32 @@
//
// PathArcArgs
//
-MagickDLLDecl int Magick::operator == ( const Magick::PathArcArgs& /*left_*/,
+MagickPPExport int Magick::operator == ( const Magick::PathArcArgs& /*left_*/,
const Magick::PathArcArgs& /*right_*/ )
{
return ( 1 );
}
-MagickDLLDecl int Magick::operator != ( const Magick::PathArcArgs& /*left_*/,
+MagickPPExport int Magick::operator != ( const Magick::PathArcArgs& /*left_*/,
const Magick::PathArcArgs& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator > ( const Magick::PathArcArgs& /*left_*/,
+MagickPPExport int Magick::operator > ( const Magick::PathArcArgs& /*left_*/,
const Magick::PathArcArgs& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator < ( const Magick::PathArcArgs& /*left_*/,
+MagickPPExport int Magick::operator < ( const Magick::PathArcArgs& /*left_*/,
const Magick::PathArcArgs& /*right_*/ )
{
return ( false );
}
-MagickDLLDecl int Magick::operator >= ( const Magick::PathArcArgs& left_,
+MagickPPExport int Magick::operator >= ( const Magick::PathArcArgs& left_,
const Magick::PathArcArgs& right_ )
{
return ( ( left_ > right_ ) || ( left_ == right_ ) );
}
-MagickDLLDecl int Magick::operator <= ( const Magick::PathArcArgs& left_,
+MagickPPExport int Magick::operator <= ( const Magick::PathArcArgs& left_,
const Magick::PathArcArgs& right_ )
{
return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -1553,32 +1553,32 @@
//
// Path Curveto (Cubic Bezier)
//
-MagickDLLDecl int Magick::operator == ( const Magick::PathCurvetoArgs& /*left_*/,
+MagickPPExport int Magick::operator == ( const Magick::PathCurvetoArgs& /*left_*/,
const Magick::PathCurvetoArgs& /*right_*/ )
{
return ( 1 );
}
-MagickDLLDecl int Magick::operator != ( const Magick::PathCurvetoArgs& /*left_*/,
+MagickPPExport int Magick::operator != ( const Magick::PathCurvetoArgs& /*left_*/,
const Magick::PathCurvetoArgs& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator > ( const Magick::PathCurvetoArgs& /*left_*/,
+MagickPPExport int Magick::operator > ( const Magick::PathCurvetoArgs& /*left_*/,
const Magick::PathCurvetoArgs& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator < ( const Magick::PathCurvetoArgs& /*left_*/,
+MagickPPExport int Magick::operator < ( const Magick::PathCurvetoArgs& /*left_*/,
const Magick::PathCurvetoArgs& /*right_*/ )
{
return ( false );
}
-MagickDLLDecl int Magick::operator >= ( const Magick::PathCurvetoArgs& left_,
+MagickPPExport int Magick::operator >= ( const Magick::PathCurvetoArgs& left_,
const Magick::PathCurvetoArgs& right_ )
{
return ( ( left_ > right_ ) || ( left_ == right_ ) );
}
-MagickDLLDecl int Magick::operator <= ( const Magick::PathCurvetoArgs& left_,
+MagickPPExport int Magick::operator <= ( const Magick::PathCurvetoArgs& left_,
const Magick::PathCurvetoArgs& right_ )
{
return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -1758,37 +1758,37 @@
//
// Quadratic Curveto (Quadratic Bezier)
//
-MagickDLLDecl int Magick::operator ==
+MagickPPExport int Magick::operator ==
( const Magick::PathQuadraticCurvetoArgs& /*left_*/,
const Magick::PathQuadraticCurvetoArgs& /*right_*/ )
{
return ( 1 );
}
-MagickDLLDecl int Magick::operator !=
+MagickPPExport int Magick::operator !=
( const Magick::PathQuadraticCurvetoArgs& /*left_*/,
const Magick::PathQuadraticCurvetoArgs& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator >
+MagickPPExport int Magick::operator >
( const Magick::PathQuadraticCurvetoArgs& /*left_*/,
const Magick::PathQuadraticCurvetoArgs& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator <
+MagickPPExport int Magick::operator <
( const Magick::PathQuadraticCurvetoArgs& /*left_*/,
const Magick::PathQuadraticCurvetoArgs& /*right_*/ )
{
return ( 0 );
}
-MagickDLLDecl int Magick::operator >=
+MagickPPExport int Magick::operator >=
( const Magick::PathQuadraticCurvetoArgs& left_,
const Magick::PathQuadraticCurvetoArgs& right_ )
{
return ( ( left_ > right_ ) || ( left_ == right_ ) );
}
-MagickDLLDecl int Magick::operator <=
+MagickPPExport int Magick::operator <=
( const Magick::PathQuadraticCurvetoArgs& left_,
const Magick::PathQuadraticCurvetoArgs& right_ )
{
diff --git a/Magick++/lib/Exception.cpp b/Magick++/lib/Exception.cpp
index 446a4e1..d2e872c 100644
--- a/Magick++/lib/Exception.cpp
+++ b/Magick++/lib/Exception.cpp
@@ -259,7 +259,7 @@
}
// Format and throw exception
-MagickDLLDecl void Magick::throwExceptionExplicit( const ExceptionType severity_,
+MagickPPExport void Magick::throwExceptionExplicit( const ExceptionType severity_,
const char* reason_,
const char* description_)
{
@@ -276,7 +276,7 @@
}
// Throw C++ exception
-MagickDLLDecl void Magick::throwException( ExceptionInfo &exception_ )
+MagickPPExport void Magick::throwException( ExceptionInfo &exception_ )
{
// Just return if there is no reported error
if ( exception_.severity == UndefinedException )
diff --git a/Magick++/lib/Image.cpp b/Magick++/lib/Image.cpp
index ad6144d..35a6c3b 100644
--- a/Magick++/lib/Image.cpp
+++ b/Magick++/lib/Image.cpp
@@ -26,9 +26,9 @@
#define AbsoluteValue(x) ((x) < 0 ? -(x) : (x))
#define DegreesToRadians(x) (MagickPI*(x)/180.0)
-MagickDLLDeclExtern const char *Magick::borderGeometryDefault = "6x6+0+0";
-MagickDLLDeclExtern const char *Magick::frameGeometryDefault = "25x25+6+6";
-MagickDLLDeclExtern const char *Magick::raiseGeometryDefault = "6x6+0+0";
+MagickPPExport const char *Magick::borderGeometryDefault = "6x6+0+0";
+MagickPPExport const char *Magick::frameGeometryDefault = "25x25+6+6";
+MagickPPExport const char *Magick::raiseGeometryDefault = "6x6+0+0";
static bool magick_initialized=false;
@@ -40,7 +40,7 @@
// Friend functions to compare Image objects
//
-MagickDLLDecl int Magick::operator == ( const Magick::Image& left_,
+MagickPPExport int Magick::operator == ( const Magick::Image& left_,
const Magick::Image& right_ )
{
// If image pixels and signature are the same, then the image is identical
@@ -49,17 +49,17 @@
( left_.signature() == right_.signature() )
);
}
-MagickDLLDecl int Magick::operator != ( const Magick::Image& left_,
+MagickPPExport int Magick::operator != ( const Magick::Image& left_,
const Magick::Image& right_ )
{
return ( ! (left_ == right_) );
}
-MagickDLLDecl int Magick::operator > ( const Magick::Image& left_,
+MagickPPExport int Magick::operator > ( const Magick::Image& left_,
const Magick::Image& right_ )
{
return ( !( left_ < right_ ) && ( left_ != right_ ) );
}
-MagickDLLDecl int Magick::operator < ( const Magick::Image& left_,
+MagickPPExport int Magick::operator < ( const Magick::Image& left_,
const Magick::Image& right_ )
{
// If image pixels are less, then image is smaller
@@ -67,12 +67,12 @@
( right_.rows() * right_.columns() )
);
}
-MagickDLLDecl int Magick::operator >= ( const Magick::Image& left_,
+MagickPPExport int Magick::operator >= ( const Magick::Image& left_,
const Magick::Image& right_ )
{
return ( ( left_ > right_ ) || ( left_ == right_ ) );
}
-MagickDLLDecl int Magick::operator <= ( const Magick::Image& left_,
+MagickPPExport int Magick::operator <= ( const Magick::Image& left_,
const Magick::Image& right_ )
{
return ( ( left_ < right_ ) || ( left_ == right_ ) );
@@ -4375,7 +4375,7 @@
}
// C library initialization routine
-void MagickDLLDecl Magick::InitializeMagick(const char *path_)
+void MagickPPExport Magick::InitializeMagick(const char *path_)
{
MagickCore::MagickCoreGenesis(path_,MagickFalse);
if (!magick_initialized)
diff --git a/Magick++/lib/Magick++/Blob.h b/Magick++/lib/Magick++/Blob.h
index 2179b0a..a3eac29 100644
--- a/Magick++/lib/Magick++/Blob.h
+++ b/Magick++/lib/Magick++/Blob.h
@@ -16,7 +16,7 @@
// Forward decl
class BlobRef;
- class MagickDLLDecl Blob
+ class MagickPPExport Blob
{
public:
diff --git a/Magick++/lib/Magick++/CoderInfo.h b/Magick++/lib/Magick++/CoderInfo.h
index ce6cfe4..5e8b580 100644
--- a/Magick++/lib/Magick++/CoderInfo.h
+++ b/Magick++/lib/Magick++/CoderInfo.h
@@ -15,7 +15,7 @@
namespace Magick
{
- class MagickDLLDecl CoderInfo
+ class MagickPPExport CoderInfo
{
public:
diff --git a/Magick++/lib/Magick++/Color.h b/Magick++/lib/Magick++/Color.h
index 581eedd..dd03a6a 100644
--- a/Magick++/lib/Magick++/Color.h
+++ b/Magick++/lib/Magick++/Color.h
@@ -13,18 +13,18 @@
namespace Magick
{
- class MagickDLLDecl Color;
+ class MagickPPExport Color;
// Compare two Color objects regardless of LHS/RHS
- int MagickDLLDecl operator == ( const Magick::Color& left_, const Magick::Color& right_ );
- int MagickDLLDecl operator != ( const Magick::Color& left_, const Magick::Color& right_ );
- int MagickDLLDecl operator > ( const Magick::Color& left_, const Magick::Color& right_ );
- int MagickDLLDecl operator < ( const Magick::Color& left_, const Magick::Color& right_ );
- int MagickDLLDecl operator >= ( const Magick::Color& left_, const Magick::Color& right_ );
- int MagickDLLDecl operator <= ( const Magick::Color& left_, const Magick::Color& right_ );
+ int MagickPPExport operator == ( const Magick::Color& left_, const Magick::Color& right_ );
+ int MagickPPExport operator != ( const Magick::Color& left_, const Magick::Color& right_ );
+ int MagickPPExport operator > ( const Magick::Color& left_, const Magick::Color& right_ );
+ int MagickPPExport operator < ( const Magick::Color& left_, const Magick::Color& right_ );
+ int MagickPPExport operator >= ( const Magick::Color& left_, const Magick::Color& right_ );
+ int MagickPPExport operator <= ( const Magick::Color& left_, const Magick::Color& right_ );
// Base color class stores RGB components scaled to fit Quantum
- class MagickDLLDecl Color
+ class MagickPPExport Color
{
public:
Color ( Quantum red_,
@@ -172,7 +172,7 @@
//
// HSL Colorspace colors
//
- class MagickDLLDecl ColorHSL : public Color
+ class MagickPPExport ColorHSL : public Color
{
public:
ColorHSL ( double hue_, double saturation_, double luminosity_ );
@@ -202,7 +202,7 @@
//
// Grayscale is simply RGB with equal parts of red, green, and blue
// All double arguments have a valid range of 0.0 - 1.0.
- class MagickDLLDecl ColorGray : public Color
+ class MagickPPExport ColorGray : public Color
{
public:
ColorGray ( double shade_ );
@@ -226,7 +226,7 @@
//
// Color arguments are constrained to 'false' (black pixel) and 'true'
// (white pixel)
- class MagickDLLDecl ColorMono : public Color
+ class MagickPPExport ColorMono : public Color
{
public:
ColorMono ( bool mono_ );
@@ -249,7 +249,7 @@
// RGB color
//
// All color arguments have a valid range of 0.0 - 1.0.
- class MagickDLLDecl ColorRGB : public Color
+ class MagickPPExport ColorRGB : public Color
{
public:
ColorRGB ( double red_, double green_, double blue_ );
@@ -281,7 +281,7 @@
// Y: 0.0 through 1.0
// U: -0.5 through 0.5
// V: -0.5 through 0.5
- class MagickDLLDecl ColorYUV : public Color
+ class MagickPPExport ColorYUV : public Color
{
public:
ColorYUV ( double y_, double u_, double v_ );
diff --git a/Magick++/lib/Magick++/Drawable.h b/Magick++/lib/Magick++/Drawable.h
index bf0a385..3e0ce0e 100644
--- a/Magick++/lib/Magick++/Drawable.h
+++ b/Magick++/lib/Magick++/Drawable.h
@@ -43,7 +43,7 @@
//
// Representation of an x,y coordinate
//
- class MagickDLLDecl Coordinate
+ class MagickPPExport Coordinate
{
public:
Coordinate ( void )
@@ -84,33 +84,33 @@
#if defined(MagickDLLBuild)
- MagickDrawableExtern template class MagickDLLDecl
+ MagickDrawableExtern template class MagickPPExport
std::allocator<Magick::Coordinate>;
-// MagickDrawableExtern template class MagickDLLDecl
+// MagickDrawableExtern template class MagickPPExport
// std::list<Magick::Coordinate, std::allocator<Magick::Coordinate> >;
#endif // MagickDLLBuild
// Compare two Coordinate objects regardless of LHS/RHS
- MagickDLLDeclExtern int operator == ( const Coordinate& left_,
+ extern MagickPPExport int operator == ( const Coordinate& left_,
const Coordinate& right_ );
- MagickDLLDeclExtern int operator != ( const Coordinate& left_,
+ extern MagickPPExport int operator != ( const Coordinate& left_,
const Coordinate& right_ );
- MagickDLLDeclExtern int operator > ( const Coordinate& left_,
+ extern MagickPPExport int operator > ( const Coordinate& left_,
const Coordinate& right_ );
- MagickDLLDeclExtern int operator < ( const Coordinate& left_,
+ extern MagickPPExport int operator < ( const Coordinate& left_,
const Coordinate& right_ );
- MagickDLLDeclExtern int operator >= ( const Coordinate& left_,
+ extern MagickPPExport int operator >= ( const Coordinate& left_,
const Coordinate& right_ );
- MagickDLLDeclExtern int operator <= ( const Coordinate& left_,
+ extern MagickPPExport int operator <= ( const Coordinate& left_,
const Coordinate& right_ );
//
// Base class for all drawable objects
//
- //struct MagickDLLDecl std::unary_function<MagickCore::DrawingWand,void>;
- class MagickDLLDecl DrawableBase:
+ //struct MagickPPExport std::unary_function<MagickCore::DrawingWand,void>;
+ class MagickPPExport DrawableBase:
public std::unary_function<MagickCore::DrawingWand,void>
{
public:
@@ -134,7 +134,7 @@
// Representation of a drawable surrogate object to manage drawable objects
//
#undef Drawable // Conflict with <X11/Xproto.h>
- class MagickDLLDecl Drawable
+ class MagickPPExport Drawable
{
public:
@@ -161,27 +161,27 @@
};
// Compare two Drawable objects regardless of LHS/RHS
- MagickDLLDeclExtern int operator == ( const Drawable& left_,
+ extern MagickPPExport int operator == ( const Drawable& left_,
const Drawable& right_ );
- MagickDLLDeclExtern int operator != ( const Drawable& left_,
+ extern MagickPPExport int operator != ( const Drawable& left_,
const Drawable& right_ );
- MagickDLLDeclExtern int operator > ( const Drawable& left_,
+ extern MagickPPExport int operator > ( const Drawable& left_,
const Drawable& right_ );
- MagickDLLDeclExtern int operator < ( const Drawable& left_,
+ extern MagickPPExport int operator < ( const Drawable& left_,
const Drawable& right_ );
- MagickDLLDeclExtern int operator >= ( const Drawable& left_,
+ extern MagickPPExport int operator >= ( const Drawable& left_,
const Drawable& right_ );
- MagickDLLDeclExtern int operator <= ( const Drawable& left_,
+ extern MagickPPExport int operator <= ( const Drawable& left_,
const Drawable& right_ );
typedef std::list<Magick::Drawable> DrawableList;
#if defined(MagickDLLBuild)
- MagickDrawableExtern template class MagickDLLDecl
+ MagickDrawableExtern template class MagickPPExport
std::allocator<Magick::Drawable>;
-// MagickDrawableExtern template class MagickDLLDecl
+// MagickDrawableExtern template class MagickPPExport
// std::list<Magick::Drawable, std::allocator<Magick::Drawable> >;
#endif // MagickDLLBuild
@@ -190,7 +190,7 @@
// Base class for all drawable path elements for use with
// DrawablePath
//
-class MagickDLLDecl VPathBase
+class MagickPPExport VPathBase
{
public:
// Constructor
@@ -215,7 +215,7 @@
// manage drawable path elements so they may be passed as a list to
// DrawablePath.
//
-class MagickDLLDecl VPath
+class MagickPPExport VPath
{
public:
// Constructor
@@ -241,27 +241,27 @@
};
// Compare two VPath objects regardless of LHS/RHS
-MagickDLLDeclExtern int operator == ( const VPath& left_,
+extern MagickPPExport int operator == ( const VPath& left_,
const VPath& right_ );
-MagickDLLDeclExtern int operator != ( const VPath& left_,
+extern MagickPPExport int operator != ( const VPath& left_,
const VPath& right_ );
-MagickDLLDeclExtern int operator > ( const VPath& left_,
+extern MagickPPExport int operator > ( const VPath& left_,
const VPath& right_ );
-MagickDLLDeclExtern int operator < ( const VPath& left_,
+extern MagickPPExport int operator < ( const VPath& left_,
const VPath& right_ );
-MagickDLLDeclExtern int operator >= ( const VPath& left_,
+extern MagickPPExport int operator >= ( const VPath& left_,
const VPath& right_ );
-MagickDLLDeclExtern int operator <= ( const VPath& left_,
+extern MagickPPExport int operator <= ( const VPath& left_,
const VPath& right_ );
typedef std::list<Magick::VPath> VPathList;
#if defined(MagickDLLBuild)
-MagickDrawableExtern template class MagickDLLDecl
+MagickDrawableExtern template class MagickPPExport
std::allocator<Magick::VPath>;
-// MagickDrawableExtern template class MagickDLLDecl
+// MagickDrawableExtern template class MagickPPExport
// std::list<Magick::VPath, std::allocator<Magick::VPath> >;
#endif // MagickDLLBuild
@@ -271,7 +271,7 @@
//
// Affine (scaling, rotation, and translation)
-class MagickDLLDecl DrawableAffine : public DrawableBase
+class MagickPPExport DrawableAffine : public DrawableBase
{
public:
DrawableAffine ( double sx_, double sy_,
@@ -348,7 +348,7 @@
};
// Arc
-class MagickDLLDecl DrawableArc : public DrawableBase
+class MagickPPExport DrawableArc : public DrawableBase
{
public:
DrawableArc ( double startX_, double startY_,
@@ -434,7 +434,7 @@
};
// Bezier curve (Coordinate list must contain at least three members)
-class MagickDLLDecl DrawableBezier : public DrawableBase
+class MagickPPExport DrawableBezier : public DrawableBase
{
public:
// Construct from coordinates
@@ -458,7 +458,7 @@
// Pop (terminate) clip path definition
-class MagickDLLDecl DrawablePopClipPath : public DrawableBase
+class MagickPPExport DrawablePopClipPath : public DrawableBase
{
public:
DrawablePopClipPath ( void )
@@ -479,7 +479,7 @@
};
// Push (create) Clip path definition
-class MagickDLLDecl DrawablePushClipPath : public DrawableBase
+class MagickPPExport DrawablePushClipPath : public DrawableBase
{
public:
DrawablePushClipPath ( const std::string &id_);
@@ -499,7 +499,7 @@
};
// Named Clip Path
-class MagickDLLDecl DrawableClipPath : public DrawableBase
+class MagickPPExport DrawableClipPath : public DrawableBase
{
public:
DrawableClipPath ( const std::string &id_ );
@@ -527,7 +527,7 @@
};
// Circle
-class MagickDLLDecl DrawableCircle : public DrawableBase
+class MagickPPExport DrawableCircle : public DrawableBase
{
public:
DrawableCircle ( double originX_, double originY_,
@@ -591,7 +591,7 @@
};
// Colorize at point using PaintMethod
-class MagickDLLDecl DrawableColor : public DrawableBase
+class MagickPPExport DrawableColor : public DrawableBase
{
public:
DrawableColor ( double x_, double y_,
@@ -643,8 +643,8 @@
};
// Draw image at point, scaled to size specified by width and height
-class MagickDLLDecl Image;
-class MagickDLLDecl DrawableCompositeImage : public DrawableBase
+class MagickPPExport Image;
+class MagickPPExport DrawableCompositeImage : public DrawableBase
{
public:
DrawableCompositeImage ( double x_, double y_,
@@ -752,7 +752,7 @@
};
// Ellipse
-class MagickDLLDecl DrawableEllipse : public DrawableBase
+class MagickPPExport DrawableEllipse : public DrawableBase
{
public:
DrawableEllipse ( double originX_, double originY_,
@@ -838,7 +838,7 @@
};
// Specify drawing fill color
-class MagickDLLDecl DrawableFillColor : public DrawableBase
+class MagickPPExport DrawableFillColor : public DrawableBase
{
public:
DrawableFillColor ( const Color &color_ );
@@ -867,7 +867,7 @@
};
// Specify fill rule (fill-rule)
-class MagickDLLDecl DrawableFillRule : public DrawableBase
+class MagickPPExport DrawableFillRule : public DrawableBase
{
public:
DrawableFillRule ( const FillRule fillRule_ )
@@ -897,7 +897,7 @@
};
// Specify drawing fill alpha
-class MagickDLLDecl DrawableFillOpacity : public DrawableBase
+class MagickPPExport DrawableFillOpacity : public DrawableBase
{
public:
DrawableFillOpacity ( double alpha_ )
@@ -927,7 +927,7 @@
};
// Specify text font
-class MagickDLLDecl DrawableFont : public DrawableBase
+class MagickPPExport DrawableFont : public DrawableBase
{
public:
DrawableFont ( const std::string &font_ );
@@ -964,7 +964,7 @@
};
// Specify text positioning gravity
-class MagickDLLDecl DrawableGravity : public DrawableBase
+class MagickPPExport DrawableGravity : public DrawableBase
{
public:
DrawableGravity ( GravityType gravity_ )
@@ -994,7 +994,7 @@
};
// Line
-class MagickDLLDecl DrawableLine : public DrawableBase
+class MagickPPExport DrawableLine : public DrawableBase
{
public:
DrawableLine ( double startX_, double startY_,
@@ -1057,7 +1057,7 @@
};
// Change pixel matte value to transparent using PaintMethod
-class MagickDLLDecl DrawableMatte : public DrawableBase
+class MagickPPExport DrawableMatte : public DrawableBase
{
public:
DrawableMatte ( double x_, double y_,
@@ -1109,7 +1109,7 @@
};
// Drawable Path
-class MagickDLLDecl DrawablePath : public DrawableBase
+class MagickPPExport DrawablePath : public DrawableBase
{
public:
DrawablePath ( const VPathList &path_ );
@@ -1129,7 +1129,7 @@
};
// Point
-class MagickDLLDecl DrawablePoint : public DrawableBase
+class MagickPPExport DrawablePoint : public DrawableBase
{
public:
DrawablePoint ( double x_, double y_ )
@@ -1169,7 +1169,7 @@
};
// Text pointsize
-class MagickDLLDecl DrawablePointSize : public DrawableBase
+class MagickPPExport DrawablePointSize : public DrawableBase
{
public:
DrawablePointSize ( double pointSize_ )
@@ -1198,7 +1198,7 @@
};
// Polygon (Coordinate list must contain at least three members)
-class MagickDLLDecl DrawablePolygon : public DrawableBase
+class MagickPPExport DrawablePolygon : public DrawableBase
{
public:
DrawablePolygon ( const CoordinateList &coordinates_ );
@@ -1218,7 +1218,7 @@
};
// Polyline (Coordinate list must contain at least three members)
-class MagickDLLDecl DrawablePolyline : public DrawableBase
+class MagickPPExport DrawablePolyline : public DrawableBase
{
public:
DrawablePolyline ( const CoordinateList &coordinates_ );
@@ -1238,7 +1238,7 @@
};
// Pop Graphic Context
-class MagickDLLDecl DrawablePopGraphicContext : public DrawableBase
+class MagickPPExport DrawablePopGraphicContext : public DrawableBase
{
public:
DrawablePopGraphicContext ( void )
@@ -1259,7 +1259,7 @@
};
// Push Graphic Context
-class MagickDLLDecl DrawablePushGraphicContext : public DrawableBase
+class MagickPPExport DrawablePushGraphicContext : public DrawableBase
{
public:
DrawablePushGraphicContext ( void )
@@ -1280,7 +1280,7 @@
};
// Pop (terminate) Pattern definition
-class MagickDLLDecl DrawablePopPattern : public DrawableBase
+class MagickPPExport DrawablePopPattern : public DrawableBase
{
public:
DrawablePopPattern ( void )
@@ -1301,7 +1301,7 @@
};
// Push (create) Pattern definition
-class MagickDLLDecl DrawablePushPattern : public DrawableBase
+class MagickPPExport DrawablePushPattern : public DrawableBase
{
public:
DrawablePushPattern ( const std::string &id_, ::ssize_t x_, ::ssize_t y_,
@@ -1326,7 +1326,7 @@
};
// Rectangle
-class MagickDLLDecl DrawableRectangle : public DrawableBase
+class MagickPPExport DrawableRectangle : public DrawableBase
{
public:
DrawableRectangle ( double upperLeftX_, double upperLeftY_,
@@ -1389,7 +1389,7 @@
};
// Apply Rotation
-class MagickDLLDecl DrawableRotation : public DrawableBase
+class MagickPPExport DrawableRotation : public DrawableBase
{
public:
DrawableRotation ( double angle_ )
@@ -1418,7 +1418,7 @@
};
// Round Rectangle
-class MagickDLLDecl DrawableRoundRectangle : public DrawableBase
+class MagickPPExport DrawableRoundRectangle : public DrawableBase
{
public:
DrawableRoundRectangle ( double centerX_, double centerY_,
@@ -1504,7 +1504,7 @@
};
// Apply Scaling
-class MagickDLLDecl DrawableScaling : public DrawableBase
+class MagickPPExport DrawableScaling : public DrawableBase
{
public:
DrawableScaling ( double x_, double y_ )
@@ -1544,7 +1544,7 @@
};
// Apply Skew in X direction
-class MagickDLLDecl DrawableSkewX : public DrawableBase
+class MagickPPExport DrawableSkewX : public DrawableBase
{
public:
DrawableSkewX ( double angle_ )
@@ -1573,7 +1573,7 @@
};
// Apply Skew in Y direction
-class MagickDLLDecl DrawableSkewY : public DrawableBase
+class MagickPPExport DrawableSkewY : public DrawableBase
{
public:
DrawableSkewY ( double angle_ )
@@ -1602,7 +1602,7 @@
};
// Stroke dasharray
-class MagickDLLDecl DrawableDashArray : public DrawableBase
+class MagickPPExport DrawableDashArray : public DrawableBase
{
public:
DrawableDashArray( const double* dasharray_ );
@@ -1633,7 +1633,7 @@
};
// Stroke dashoffset
-class MagickDLLDecl DrawableDashOffset : public DrawableBase
+class MagickPPExport DrawableDashOffset : public DrawableBase
{
public:
DrawableDashOffset ( const double offset_ )
@@ -1662,7 +1662,7 @@
};
// Stroke linecap
-class MagickDLLDecl DrawableStrokeLineCap : public DrawableBase
+class MagickPPExport DrawableStrokeLineCap : public DrawableBase
{
public:
DrawableStrokeLineCap ( LineCap linecap_ )
@@ -1691,7 +1691,7 @@
};
// Stroke linejoin
-class MagickDLLDecl DrawableStrokeLineJoin : public DrawableBase
+class MagickPPExport DrawableStrokeLineJoin : public DrawableBase
{
public:
DrawableStrokeLineJoin ( LineJoin linejoin_ )
@@ -1720,7 +1720,7 @@
};
// Stroke miterlimit
-class MagickDLLDecl DrawableMiterLimit : public DrawableBase
+class MagickPPExport DrawableMiterLimit : public DrawableBase
{
public:
DrawableMiterLimit ( size_t miterlimit_ )
@@ -1750,7 +1750,7 @@
// Stroke antialias
-class MagickDLLDecl DrawableStrokeAntialias : public DrawableBase
+class MagickPPExport DrawableStrokeAntialias : public DrawableBase
{
public:
DrawableStrokeAntialias ( bool flag_ )
@@ -1779,7 +1779,7 @@
};
// Stroke color
-class MagickDLLDecl DrawableStrokeColor : public DrawableBase
+class MagickPPExport DrawableStrokeColor : public DrawableBase
{
public:
DrawableStrokeColor ( const Color &color_ );
@@ -1808,7 +1808,7 @@
};
// Stroke alpha
-class MagickDLLDecl DrawableStrokeOpacity : public DrawableBase
+class MagickPPExport DrawableStrokeOpacity : public DrawableBase
{
public:
DrawableStrokeOpacity ( double alpha_ )
@@ -1838,7 +1838,7 @@
};
// Stroke width
-class MagickDLLDecl DrawableStrokeWidth : public DrawableBase
+class MagickPPExport DrawableStrokeWidth : public DrawableBase
{
public:
DrawableStrokeWidth ( double width_ )
@@ -1867,7 +1867,7 @@
};
// Draw text at point
-class MagickDLLDecl DrawableText : public DrawableBase
+class MagickPPExport DrawableText : public DrawableBase
{
public:
DrawableText ( const double x_, const double y_,
@@ -1925,7 +1925,7 @@
};
// Text antialias
-class MagickDLLDecl DrawableTextAntialias : public DrawableBase
+class MagickPPExport DrawableTextAntialias : public DrawableBase
{
public:
DrawableTextAntialias ( bool flag_ );
@@ -1954,7 +1954,7 @@
};
// Decoration (text decoration)
-class MagickDLLDecl DrawableTextDecoration : public DrawableBase
+class MagickPPExport DrawableTextDecoration : public DrawableBase
{
public:
DrawableTextDecoration ( DecorationType decoration_ );
@@ -1983,7 +1983,7 @@
};
// Text undercolor box
-class MagickDLLDecl DrawableTextUnderColor : public DrawableBase
+class MagickPPExport DrawableTextUnderColor : public DrawableBase
{
public:
DrawableTextUnderColor ( const Color &color_ );
@@ -2012,7 +2012,7 @@
};
// Apply Translation
-class MagickDLLDecl DrawableTranslation : public DrawableBase
+class MagickPPExport DrawableTranslation : public DrawableBase
{
public:
DrawableTranslation ( double x_, double y_ )
@@ -2052,7 +2052,7 @@
};
// Set the size of the viewbox
-class MagickDLLDecl DrawableViewbox : public DrawableBase
+class MagickPPExport DrawableViewbox : public DrawableBase
{
public:
DrawableViewbox(::ssize_t x1_, ::ssize_t y1_,
@@ -2117,7 +2117,7 @@
//
// Path Element Classes To Support DrawablePath
//
-class MagickDLLDecl PathArcArgs
+class MagickPPExport PathArcArgs
{
public:
PathArcArgs( void );
@@ -2204,33 +2204,33 @@
};
// Compare two PathArcArgs objects regardless of LHS/RHS
-MagickDLLDeclExtern int operator == ( const PathArcArgs& left_,
+extern MagickPPExport int operator == ( const PathArcArgs& left_,
const PathArcArgs& right_ );
-MagickDLLDeclExtern int operator != ( const PathArcArgs& left_,
+extern MagickPPExport int operator != ( const PathArcArgs& left_,
const PathArcArgs& right_ );
-MagickDLLDeclExtern int operator > ( const PathArcArgs& left_,
+extern MagickPPExport int operator > ( const PathArcArgs& left_,
const PathArcArgs& right_ );
-MagickDLLDeclExtern int operator < ( const PathArcArgs& left_,
+extern MagickPPExport int operator < ( const PathArcArgs& left_,
const PathArcArgs& right_ );
-MagickDLLDeclExtern int operator >= ( const PathArcArgs& left_,
+extern MagickPPExport int operator >= ( const PathArcArgs& left_,
const PathArcArgs& right_ );
-MagickDLLDeclExtern int operator <= ( const PathArcArgs& left_,
+extern MagickPPExport int operator <= ( const PathArcArgs& left_,
const PathArcArgs& right_ );
typedef std::list<Magick::PathArcArgs> PathArcArgsList;
#if defined(MagickDLLBuild)
-MagickDrawableExtern template class MagickDLLDecl
+MagickDrawableExtern template class MagickPPExport
std::allocator<Magick::PathArcArgs>;
-// MagickDrawableExtern template class MagickDLLDecl
+// MagickDrawableExtern template class MagickPPExport
// std::list<Magick::PathArcArgs, std::allocator<Magick::PathArcArgs> >;
#endif // MagickDLLBuild
// Path Arc (Elliptical Arc)
-class MagickDLLDecl PathArcAbs : public VPathBase
+class MagickPPExport PathArcAbs : public VPathBase
{
public:
// Draw a single arc segment
@@ -2254,7 +2254,7 @@
private:
PathArcArgsList _coordinates;
};
-class MagickDLLDecl PathArcRel : public VPathBase
+class MagickPPExport PathArcRel : public VPathBase
{
public:
// Draw a single arc segment
@@ -2278,7 +2278,7 @@
};
// Path Closepath
-class MagickDLLDecl PathClosePath : public VPathBase
+class MagickPPExport PathClosePath : public VPathBase
{
public:
PathClosePath ( void )
@@ -2301,7 +2301,7 @@
//
// Curveto (Cubic Bezier)
//
-class MagickDLLDecl PathCurvetoArgs
+class MagickPPExport PathCurvetoArgs
{
public:
PathCurvetoArgs( void );
@@ -2378,32 +2378,32 @@
};
// Compare two PathCurvetoArgs objects regardless of LHS/RHS
-MagickDLLDeclExtern int operator == ( const PathCurvetoArgs& left_,
+extern MagickPPExport int operator == ( const PathCurvetoArgs& left_,
const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern int operator != ( const PathCurvetoArgs& left_,
+extern MagickPPExport int operator != ( const PathCurvetoArgs& left_,
const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern int operator > ( const PathCurvetoArgs& left_,
+extern MagickPPExport int operator > ( const PathCurvetoArgs& left_,
const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern int operator < ( const PathCurvetoArgs& left_,
+extern MagickPPExport int operator < ( const PathCurvetoArgs& left_,
const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern int operator >= ( const PathCurvetoArgs& left_,
+extern MagickPPExport int operator >= ( const PathCurvetoArgs& left_,
const PathCurvetoArgs& right_ );
-MagickDLLDeclExtern int operator <= ( const PathCurvetoArgs& left_,
+extern MagickPPExport int operator <= ( const PathCurvetoArgs& left_,
const PathCurvetoArgs& right_ );
typedef std::list<Magick::PathCurvetoArgs> PathCurveToArgsList;
#if defined(MagickDLLBuild)
-MagickDrawableExtern template class MagickDLLDecl
+MagickDrawableExtern template class MagickPPExport
std::allocator<Magick::PathCurvetoArgs>;
-// MagickDrawableExtern template class MagickDLLDecl
+// MagickDrawableExtern template class MagickPPExport
// std::list<Magick::PathCurvetoArgs, std::allocator<Magick::PathCurvetoArgs> >;
#endif // MagickDLLBuild
-class MagickDLLDecl PathCurvetoAbs : public VPathBase
+class MagickPPExport PathCurvetoAbs : public VPathBase
{
public:
// Draw a single curve
@@ -2427,7 +2427,7 @@
private:
PathCurveToArgsList _args;
};
-class MagickDLLDecl PathCurvetoRel : public VPathBase
+class MagickPPExport PathCurvetoRel : public VPathBase
{
public:
// Draw a single curve
@@ -2450,7 +2450,7 @@
private:
PathCurveToArgsList _args;
};
-class MagickDLLDecl PathSmoothCurvetoAbs : public VPathBase
+class MagickPPExport PathSmoothCurvetoAbs : public VPathBase
{
public:
// Draw a single curve
@@ -2474,7 +2474,7 @@
private:
CoordinateList _coordinates;
};
-class MagickDLLDecl PathSmoothCurvetoRel : public VPathBase
+class MagickPPExport PathSmoothCurvetoRel : public VPathBase
{
public:
// Draw a single curve
@@ -2503,7 +2503,7 @@
//
// Quadratic Curveto (Quadratic Bezier)
//
-class MagickDLLDecl PathQuadraticCurvetoArgs
+class MagickPPExport PathQuadraticCurvetoArgs
{
public:
PathQuadraticCurvetoArgs( void );
@@ -2559,32 +2559,32 @@
};
// Compare two PathQuadraticCurvetoArgs objects regardless of LHS/RHS
-MagickDLLDeclExtern int operator == ( const PathQuadraticCurvetoArgs& left_,
+extern MagickPPExport int operator == ( const PathQuadraticCurvetoArgs& left_,
const PathQuadraticCurvetoArgs& right_ );
-MagickDLLDeclExtern int operator != ( const PathQuadraticCurvetoArgs& left_,
+extern MagickPPExport int operator != ( const PathQuadraticCurvetoArgs& left_,
const PathQuadraticCurvetoArgs& right_);
-MagickDLLDeclExtern int operator > ( const PathQuadraticCurvetoArgs& left_,
+extern MagickPPExport int operator > ( const PathQuadraticCurvetoArgs& left_,
const PathQuadraticCurvetoArgs& right_);
-MagickDLLDeclExtern int operator < ( const PathQuadraticCurvetoArgs& left_,
+extern MagickPPExport int operator < ( const PathQuadraticCurvetoArgs& left_,
const PathQuadraticCurvetoArgs& right_);
-MagickDLLDeclExtern int operator >= ( const PathQuadraticCurvetoArgs& left_,
+extern MagickPPExport int operator >= ( const PathQuadraticCurvetoArgs& left_,
const PathQuadraticCurvetoArgs& right_ );
-MagickDLLDeclExtern int operator <= ( const PathQuadraticCurvetoArgs& left_,
+extern MagickPPExport int operator <= ( const PathQuadraticCurvetoArgs& left_,
const PathQuadraticCurvetoArgs& right_ );
typedef std::list<Magick::PathQuadraticCurvetoArgs> PathQuadraticCurvetoArgsList;
#if defined(MagickDLLBuild)
-MagickDrawableExtern template class MagickDLLDecl
+MagickDrawableExtern template class MagickPPExport
std::allocator<Magick::PathQuadraticCurvetoArgs>;
-// MagickDrawableExtern template class MagickDLLDecl
+// MagickDrawableExtern template class MagickPPExport
// std::list<Magick::PathQuadraticCurvetoArgs, std::allocator<Magick::PathQuadraticCurvetoArgs> >;
#endif // MagickDLLBuild
-class MagickDLLDecl PathQuadraticCurvetoAbs : public VPathBase
+class MagickPPExport PathQuadraticCurvetoAbs : public VPathBase
{
public:
// Draw a single curve
@@ -2608,7 +2608,7 @@
private:
PathQuadraticCurvetoArgsList _args;
};
-class MagickDLLDecl PathQuadraticCurvetoRel : public VPathBase
+class MagickPPExport PathQuadraticCurvetoRel : public VPathBase
{
public:
// Draw a single curve
@@ -2632,7 +2632,7 @@
private:
PathQuadraticCurvetoArgsList _args;
};
-class MagickDLLDecl PathSmoothQuadraticCurvetoAbs : public VPathBase
+class MagickPPExport PathSmoothQuadraticCurvetoAbs : public VPathBase
{
public:
// Draw a single curve
@@ -2656,7 +2656,7 @@
private:
CoordinateList _coordinates;
};
-class MagickDLLDecl PathSmoothQuadraticCurvetoRel : public VPathBase
+class MagickPPExport PathSmoothQuadraticCurvetoRel : public VPathBase
{
public:
// Draw a single curve
@@ -2684,7 +2684,7 @@
//
// Path Lineto
//
-class MagickDLLDecl PathLinetoAbs : public VPathBase
+class MagickPPExport PathLinetoAbs : public VPathBase
{
public:
// Draw to a single point
@@ -2708,7 +2708,7 @@
private:
CoordinateList _coordinates;
};
-class MagickDLLDecl PathLinetoRel : public VPathBase
+class MagickPPExport PathLinetoRel : public VPathBase
{
public:
// Draw to a single point
@@ -2734,7 +2734,7 @@
};
// Path Horizontal Lineto
-class MagickDLLDecl PathLinetoHorizontalAbs : public VPathBase
+class MagickPPExport PathLinetoHorizontalAbs : public VPathBase
{
public:
PathLinetoHorizontalAbs ( double x_ )
@@ -2762,7 +2762,7 @@
private:
double _x;
};
-class MagickDLLDecl PathLinetoHorizontalRel : public VPathBase
+class MagickPPExport PathLinetoHorizontalRel : public VPathBase
{
public:
PathLinetoHorizontalRel ( double x_ )
@@ -2792,7 +2792,7 @@
};
// Path Vertical Lineto
-class MagickDLLDecl PathLinetoVerticalAbs : public VPathBase
+class MagickPPExport PathLinetoVerticalAbs : public VPathBase
{
public:
PathLinetoVerticalAbs ( double y_ )
@@ -2820,7 +2820,7 @@
private:
double _y;
};
-class MagickDLLDecl PathLinetoVerticalRel : public VPathBase
+class MagickPPExport PathLinetoVerticalRel : public VPathBase
{
public:
PathLinetoVerticalRel ( double y_ )
@@ -2850,7 +2850,7 @@
};
// Path Moveto
-class MagickDLLDecl PathMovetoAbs : public VPathBase
+class MagickPPExport PathMovetoAbs : public VPathBase
{
public:
// Simple moveto
@@ -2874,7 +2874,7 @@
private:
CoordinateList _coordinates;
};
-class MagickDLLDecl PathMovetoRel : public VPathBase
+class MagickPPExport PathMovetoRel : public VPathBase
{
public:
// Simple moveto
diff --git a/Magick++/lib/Magick++/Exception.h b/Magick++/lib/Magick++/Exception.h
index 9f0c859..f5b3342 100644
--- a/Magick++/lib/Magick++/Exception.h
+++ b/Magick++/lib/Magick++/Exception.h
@@ -18,7 +18,7 @@
namespace Magick
{
- class MagickDLLDecl Exception : public std::exception
+ class MagickPPExport Exception : public std::exception
{
public:
Exception( const std::string& what_ );
@@ -35,121 +35,121 @@
// Warnings
//
- class MagickDLLDecl Warning : public Exception
+ class MagickPPExport Warning : public Exception
{
public:
explicit Warning ( const std::string& what_ );
};
- class MagickDLLDecl WarningUndefined : public Warning
+ class MagickPPExport WarningUndefined : public Warning
{
public:
explicit WarningUndefined ( const std::string& what_ );
};
- class MagickDLLDecl WarningBlob: public Warning
+ class MagickPPExport WarningBlob: public Warning
{
public:
explicit WarningBlob ( const std::string& what_ );
};
- class MagickDLLDecl WarningCache: public Warning
+ class MagickPPExport WarningCache: public Warning
{
public:
explicit WarningCache ( const std::string& what_ );
};
- class MagickDLLDecl WarningCoder: public Warning
+ class MagickPPExport WarningCoder: public Warning
{
public:
explicit WarningCoder ( const std::string& what_ );
};
- class MagickDLLDecl WarningConfigure: public Warning
+ class MagickPPExport WarningConfigure: public Warning
{
public:
explicit WarningConfigure ( const std::string& what_ );
};
- class MagickDLLDecl WarningCorruptImage: public Warning
+ class MagickPPExport WarningCorruptImage: public Warning
{
public:
explicit WarningCorruptImage ( const std::string& what_ );
};
- class MagickDLLDecl WarningDelegate : public Warning
+ class MagickPPExport WarningDelegate : public Warning
{
public:
explicit WarningDelegate ( const std::string& what_ );
};
- class MagickDLLDecl WarningDraw : public Warning
+ class MagickPPExport WarningDraw : public Warning
{
public:
explicit WarningDraw ( const std::string& what_ );
};
- class MagickDLLDecl WarningFileOpen: public Warning
+ class MagickPPExport WarningFileOpen: public Warning
{
public:
explicit WarningFileOpen ( const std::string& what_ );
};
- class MagickDLLDecl WarningImage: public Warning
+ class MagickPPExport WarningImage: public Warning
{
public:
explicit WarningImage ( const std::string& what_ );
};
- class MagickDLLDecl WarningMissingDelegate : public Warning
+ class MagickPPExport WarningMissingDelegate : public Warning
{
public:
explicit WarningMissingDelegate ( const std::string& what_ );
};
- class MagickDLLDecl WarningModule : public Warning
+ class MagickPPExport WarningModule : public Warning
{
public:
explicit WarningModule ( const std::string& what_ );
};
- class MagickDLLDecl WarningMonitor : public Warning
+ class MagickPPExport WarningMonitor : public Warning
{
public:
explicit WarningMonitor ( const std::string& what_ );
};
- class MagickDLLDecl WarningOption : public Warning
+ class MagickPPExport WarningOption : public Warning
{
public:
explicit WarningOption ( const std::string& what_ );
};
- class MagickDLLDecl WarningRegistry : public Warning
+ class MagickPPExport WarningRegistry : public Warning
{
public:
explicit WarningRegistry ( const std::string& what_ );
};
- class MagickDLLDecl WarningResourceLimit : public Warning
+ class MagickPPExport WarningResourceLimit : public Warning
{
public:
explicit WarningResourceLimit ( const std::string& what_ );
};
- class MagickDLLDecl WarningStream : public Warning
+ class MagickPPExport WarningStream : public Warning
{
public:
explicit WarningStream ( const std::string& what_ );
};
- class MagickDLLDecl WarningType : public Warning
+ class MagickPPExport WarningType : public Warning
{
public:
explicit WarningType ( const std::string& what_ );
};
- class MagickDLLDecl WarningXServer : public Warning
+ class MagickPPExport WarningXServer : public Warning
{
public:
explicit WarningXServer ( const std::string& what_ );
@@ -159,121 +159,121 @@
// Error exceptions
//
- class MagickDLLDecl Error : public Exception
+ class MagickPPExport Error : public Exception
{
public:
explicit Error ( const std::string& what_ );
};
- class MagickDLLDecl ErrorUndefined : public Error
+ class MagickPPExport ErrorUndefined : public Error
{
public:
explicit ErrorUndefined ( const std::string& what_ );
};
- class MagickDLLDecl ErrorBlob: public Error
+ class MagickPPExport ErrorBlob: public Error
{
public:
explicit ErrorBlob ( const std::string& what_ );
};
- class MagickDLLDecl ErrorCache: public Error
+ class MagickPPExport ErrorCache: public Error
{
public:
explicit ErrorCache ( const std::string& what_ );
};
- class MagickDLLDecl ErrorCoder: public Error
+ class MagickPPExport ErrorCoder: public Error
{
public:
explicit ErrorCoder ( const std::string& what_ );
};
- class MagickDLLDecl ErrorConfigure: public Error
+ class MagickPPExport ErrorConfigure: public Error
{
public:
explicit ErrorConfigure ( const std::string& what_ );
};
- class MagickDLLDecl ErrorCorruptImage: public Error
+ class MagickPPExport ErrorCorruptImage: public Error
{
public:
explicit ErrorCorruptImage ( const std::string& what_ );
};
- class MagickDLLDecl ErrorDelegate : public Error
+ class MagickPPExport ErrorDelegate : public Error
{
public:
explicit ErrorDelegate ( const std::string& what_ );
};
- class MagickDLLDecl ErrorDraw : public Error
+ class MagickPPExport ErrorDraw : public Error
{
public:
explicit ErrorDraw ( const std::string& what_ );
};
- class MagickDLLDecl ErrorFileOpen: public Error
+ class MagickPPExport ErrorFileOpen: public Error
{
public:
explicit ErrorFileOpen ( const std::string& what_ );
};
- class MagickDLLDecl ErrorImage: public Error
+ class MagickPPExport ErrorImage: public Error
{
public:
explicit ErrorImage ( const std::string& what_ );
};
- class MagickDLLDecl ErrorMissingDelegate : public Error
+ class MagickPPExport ErrorMissingDelegate : public Error
{
public:
explicit ErrorMissingDelegate ( const std::string& what_ );
};
- class MagickDLLDecl ErrorModule : public Error
+ class MagickPPExport ErrorModule : public Error
{
public:
explicit ErrorModule ( const std::string& what_ );
};
- class MagickDLLDecl ErrorMonitor : public Error
+ class MagickPPExport ErrorMonitor : public Error
{
public:
explicit ErrorMonitor ( const std::string& what_ );
};
- class MagickDLLDecl ErrorOption : public Error
+ class MagickPPExport ErrorOption : public Error
{
public:
explicit ErrorOption ( const std::string& what_ );
};
- class MagickDLLDecl ErrorRegistry : public Error
+ class MagickPPExport ErrorRegistry : public Error
{
public:
explicit ErrorRegistry ( const std::string& what_ );
};
- class MagickDLLDecl ErrorResourceLimit : public Error
+ class MagickPPExport ErrorResourceLimit : public Error
{
public:
explicit ErrorResourceLimit ( const std::string& what_ );
};
- class MagickDLLDecl ErrorStream : public Error
+ class MagickPPExport ErrorStream : public Error
{
public:
explicit ErrorStream ( const std::string& what_ );
};
- class MagickDLLDecl ErrorType : public Error
+ class MagickPPExport ErrorType : public Error
{
public:
explicit ErrorType ( const std::string& what_ );
};
- class MagickDLLDecl ErrorXServer : public Error
+ class MagickPPExport ErrorXServer : public Error
{
public:
explicit ErrorXServer ( const std::string& what_ );
@@ -284,12 +284,12 @@
//
// Throw exception based on raw data
- MagickDLLDeclExtern void throwExceptionExplicit( const MagickCore::ExceptionType severity_,
+ extern MagickPPExport void throwExceptionExplicit( const MagickCore::ExceptionType severity_,
const char* reason_,
const char* description_ = 0 );
// Thow exception based on ImageMagick's ExceptionInfo
- MagickDLLDeclExtern void throwException( MagickCore::ExceptionInfo &exception_ );
+ extern MagickPPExport void throwException( MagickCore::ExceptionInfo &exception_ );
} // namespace Magick
diff --git a/Magick++/lib/Magick++/Functions.h b/Magick++/lib/Magick++/Functions.h
index a1811d0..2cbea42 100644
--- a/Magick++/lib/Magick++/Functions.h
+++ b/Magick++/lib/Magick++/Functions.h
@@ -14,7 +14,7 @@
namespace Magick
{
- void MagickDLLDecl CloneString( char **destination_, const std::string &source_ );
+ void MagickPPExport CloneString( char **destination_, const std::string &source_ );
}
#endif // Magick_Functions_header
diff --git a/Magick++/lib/Magick++/Geometry.h b/Magick++/lib/Magick++/Geometry.h
index a84e564..7b6ad6f 100644
--- a/Magick++/lib/Magick++/Geometry.h
+++ b/Magick++/lib/Magick++/Geometry.h
@@ -16,17 +16,17 @@
namespace Magick
{
- class MagickDLLDecl Geometry;
+ class MagickPPExport Geometry;
// Compare two Geometry objects regardless of LHS/RHS
- int MagickDLLDecl operator == ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
- int MagickDLLDecl operator != ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
- int MagickDLLDecl operator > ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
- int MagickDLLDecl operator < ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
- int MagickDLLDecl operator >= ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
- int MagickDLLDecl operator <= ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+ int MagickPPExport operator == ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+ int MagickPPExport operator != ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+ int MagickPPExport operator > ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+ int MagickPPExport operator < ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+ int MagickPPExport operator >= ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
+ int MagickPPExport operator <= ( const Magick::Geometry& left_, const Magick::Geometry& right_ );
- class MagickDLLDecl Geometry
+ class MagickPPExport Geometry
{
public:
diff --git a/Magick++/lib/Magick++/Image.h b/Magick++/lib/Magick++/Image.h
index a277ad3..ac4dade 100644
--- a/Magick++/lib/Magick++/Image.h
+++ b/Magick++/lib/Magick++/Image.h
@@ -24,34 +24,34 @@
class Options;
class ImageRef;
- extern MagickDLLDecl const char *borderGeometryDefault;
- extern MagickDLLDecl const char *frameGeometryDefault;
- extern MagickDLLDecl const char *raiseGeometryDefault;
+ extern MagickPPExport const char *borderGeometryDefault;
+ extern MagickPPExport const char *frameGeometryDefault;
+ extern MagickPPExport const char *raiseGeometryDefault;
// Compare two Image objects regardless of LHS/RHS
// Image sizes and signatures are used as basis of comparison
- int MagickDLLDecl operator == ( const Magick::Image& left_,
+ int MagickPPExport operator == ( const Magick::Image& left_,
const Magick::Image& right_ );
- int MagickDLLDecl operator != ( const Magick::Image& left_,
+ int MagickPPExport operator != ( const Magick::Image& left_,
const Magick::Image& right_ );
- int MagickDLLDecl operator > ( const Magick::Image& left_,
+ int MagickPPExport operator > ( const Magick::Image& left_,
const Magick::Image& right_ );
- int MagickDLLDecl operator < ( const Magick::Image& left_,
+ int MagickPPExport operator < ( const Magick::Image& left_,
const Magick::Image& right_ );
- int MagickDLLDecl operator >= ( const Magick::Image& left_,
+ int MagickPPExport operator >= ( const Magick::Image& left_,
const Magick::Image& right_ );
- int MagickDLLDecl operator <= ( const Magick::Image& left_,
+ int MagickPPExport operator <= ( const Magick::Image& left_,
const Magick::Image& right_ );
// C library initialization routine
- void MagickDLLDecl InitializeMagick(const char *path_);
+ void MagickPPExport InitializeMagick(const char *path_);
//
// Image is the representation of an image. In reality, it actually
// a handle object which contains a pointer to a shared reference
// object (ImageRef). As such, this object is extremely space efficient.
//
- class MagickDLLDecl Image
+ class Image
{
public:
// Construct from image file or image specification
diff --git a/Magick++/lib/Magick++/ImageRef.h b/Magick++/lib/Magick++/ImageRef.h
index d31078f..87065ad 100644
--- a/Magick++/lib/Magick++/ImageRef.h
+++ b/Magick++/lib/Magick++/ImageRef.h
@@ -21,7 +21,7 @@
//
// Reference counted access to Image *
//
- class MagickDLLDecl ImageRef {
+ class MagickPPExport ImageRef {
friend class Image;
private:
// Construct with an image pointer and default options
diff --git a/Magick++/lib/Magick++/Include.h b/Magick++/lib/Magick++/Include.h
index 85ce211..1aa226b 100644
--- a/Magick++/lib/Magick++/Include.h
+++ b/Magick++/lib/Magick++/Include.h
@@ -51,65 +51,76 @@
#undef class
}
-//
-// 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
-# if defined(_VISUALC_)
-# pragma warning( disable: 4273 ) /* Disable the stupid dll linkage warnings */
-# pragma warning( disable: 4251 )
-# endif
-# if !defined(MAGICKCORE_IMPLEMENTATION)
-# define MagickDLLDecl __declspec(dllimport)
-# define MagickDLLDeclExtern extern __declspec(dllimport)
-# if defined(_VISUALC_)
-# pragma message( "Magick++ lib DLL import" )
-# endif
-# else
-# if defined(__BORLANDC__)
-# define MagickDLLDecl __declspec(dllexport)
-# define MagickDLLDeclExtern __declspec(dllexport)
-# pragma message( "BCBMagick++ lib DLL export" )
-# else
-# define MagickDLLDecl __declspec(dllexport)
-# define MagickDLLDeclExtern extern __declspec(dllexport)
-# endif
-# if defined(_VISUALC_)
-# pragma message( "Magick++ lib DLL export" )
-# endif
-# endif
-# else
-# define MagickDLLDecl
-# define MagickDLLDeclExtern
-# if defined(_VISUALC_)
-# pragma message( "Magick++ lib static interface" )
-# endif
+#if defined(MAGICKCORE_WINDOWS_SUPPORT) || defined(__CYGWIN__) || defined(__MINGW32__)
+# 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
-#else
-# define MagickDLLDecl
-# define MagickDLLDeclExtern
-#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
+# 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" )
+# endif
+# endif
-#if defined(WIN32) && defined(_VISUALC_)
-# pragma warning(disable : 4996) /* function deprecation warnings */
+# 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")))
+# define MagickPPPrivate __attribute__ ((visibility ("hidden")))
+# else
+# define MagickPPExport
+# define MagickPPPrivate
+# endif
+# define MagickPPGlobal
#endif
//
diff --git a/Magick++/lib/Magick++/Montage.h b/Magick++/lib/Magick++/Montage.h
index e54696e..33b77eb 100644
--- a/Magick++/lib/Magick++/Montage.h
+++ b/Magick++/lib/Magick++/Montage.h
@@ -18,7 +18,7 @@
//
namespace Magick
{
- class MagickDLLDecl Montage
+ class MagickPPExport Montage
{
public:
Montage( void );
@@ -105,7 +105,7 @@
//
// Montage With Frames (Extends Basic Montage)
//
- class MagickDLLDecl MontageFramed : public Montage
+ class MagickPPExport MontageFramed : public Montage
{
public:
MontageFramed ( void );
diff --git a/Magick++/lib/Magick++/Options.h b/Magick++/lib/Magick++/Options.h
index 8491958..1b32208 100644
--- a/Magick++/lib/Magick++/Options.h
+++ b/Magick++/lib/Magick++/Options.h
@@ -22,7 +22,7 @@
namespace Magick
{
- class MagickDLLDecl Image;
+ class Image;
class Options
{
diff --git a/Magick++/lib/Magick++/Pixels.h b/Magick++/lib/Magick++/Pixels.h
index 22c6a76..062e479 100644
--- a/Magick++/lib/Magick++/Pixels.h
+++ b/Magick++/lib/Magick++/Pixels.h
@@ -14,7 +14,7 @@
namespace Magick
{
- class MagickDLLDecl Pixels
+ class MagickPPExport Pixels
{
public:
diff --git a/Magick++/lib/Magick++/STL.h b/Magick++/lib/Magick++/STL.h
index df6c43a..e8fe33f 100644
--- a/Magick++/lib/Magick++/STL.h
+++ b/Magick++/lib/Magick++/STL.h
@@ -43,7 +43,7 @@
// writeImages( images.begin(), images.end(), "animation.gif" );
// Adaptive-blur image with specified blur factor
- class MagickDLLDecl adaptiveBlurImage : public std::unary_function<Image&,void>
+ class MagickPPExport adaptiveBlurImage : public std::unary_function<Image&,void>
{
public:
adaptiveBlurImage( const double radius_ = 1, const double sigma_ = 0.5 );
@@ -59,7 +59,7 @@
// http://www.dai.ed.ac.uk/HIPR2/adpthrsh.htm
// Width x height define the size of the pixel neighborhood
// offset = constant to subtract from pixel neighborhood mean
- class MagickDLLDecl adaptiveThresholdImage : public std::unary_function<Image&,void>
+ class MagickPPExport adaptiveThresholdImage : public std::unary_function<Image&,void>
{
public:
adaptiveThresholdImage( const size_t width_,
@@ -75,7 +75,7 @@
};
// Add noise to image with specified noise type
- class MagickDLLDecl addNoiseImage : public std::unary_function<Image&,void>
+ class MagickPPExport addNoiseImage : public std::unary_function<Image&,void>
{
public:
addNoiseImage ( NoiseType noiseType_ );
@@ -87,7 +87,7 @@
};
// Transform image by specified affine (or free transform) matrix.
- class MagickDLLDecl affineTransformImage : public std::unary_function<Image&,void>
+ class MagickPPExport affineTransformImage : public std::unary_function<Image&,void>
{
public:
affineTransformImage( const DrawableAffine &affine_ );
@@ -99,7 +99,7 @@
};
// Annotate image (draw text on image)
- class MagickDLLDecl annotateImage : public std::unary_function<Image&,void>
+ class MagickPPExport annotateImage : public std::unary_function<Image&,void>
{
public:
// Annotate using specified text, and placement location
@@ -138,7 +138,7 @@
};
// Blur image with specified blur factor
- class MagickDLLDecl blurImage : public std::unary_function<Image&,void>
+ class MagickPPExport blurImage : public std::unary_function<Image&,void>
{
public:
blurImage( const double radius_ = 1, const double sigma_ = 0.5 );
@@ -151,7 +151,7 @@
};
// Border image (add border to image)
- class MagickDLLDecl borderImage : public std::unary_function<Image&,void>
+ class MagickPPExport borderImage : public std::unary_function<Image&,void>
{
public:
borderImage( const Geometry &geometry_ = borderGeometryDefault );
@@ -163,7 +163,7 @@
};
// Extract channel from image
- class MagickDLLDecl channelImage : public std::unary_function<Image&,void>
+ class MagickPPExport channelImage : public std::unary_function<Image&,void>
{
public:
channelImage( const ChannelType channel_ );
@@ -175,7 +175,7 @@
};
// Charcoal effect image (looks like charcoal sketch)
- class MagickDLLDecl charcoalImage : public std::unary_function<Image&,void>
+ class MagickPPExport charcoalImage : public std::unary_function<Image&,void>
{
public:
charcoalImage( const double radius_ = 1, const double sigma_ = 0.5 );
@@ -188,7 +188,7 @@
};
// Chop image (remove vertical or horizontal subregion of image)
- class MagickDLLDecl chopImage : public std::unary_function<Image&,void>
+ class MagickPPExport chopImage : public std::unary_function<Image&,void>
{
public:
chopImage( const Geometry &geometry_ );
@@ -202,7 +202,7 @@
// Accepts a lightweight Color Correction Collection (CCC) file which solely
// contains one or more color corrections and applies the correction to the
// image.
- class MagickDLLDecl cdlImage : public std::unary_function<Image&,void>
+ class MagickPPExport cdlImage : public std::unary_function<Image&,void>
{
public:
cdlImage( const std::string &cdl_ );
@@ -214,7 +214,7 @@
};
// Colorize image using pen color at specified percent alpha
- class MagickDLLDecl colorizeImage : public std::unary_function<Image&,void>
+ class MagickPPExport colorizeImage : public std::unary_function<Image&,void>
{
public:
colorizeImage( const unsigned int alphaRed_,
@@ -236,7 +236,7 @@
// Apply a color matrix to the image channels. The user supplied
// matrix may be of order 1 to 5 (1x1 through 5x5).
- class MagickDLLDecl colorMatrixImage : public std::unary_function<Image&,void>
+ class MagickPPExport colorMatrixImage : public std::unary_function<Image&,void>
{
public:
colorMatrixImage( const size_t order_,
@@ -250,7 +250,7 @@
};
// Convert the image colorspace representation
- class MagickDLLDecl colorSpaceImage : public std::unary_function<Image&,void>
+ class MagickPPExport colorSpaceImage : public std::unary_function<Image&,void>
{
public:
colorSpaceImage( ColorspaceType colorSpace_ );
@@ -262,7 +262,7 @@
};
// Comment image (add comment string to image)
- class MagickDLLDecl commentImage : public std::unary_function<Image&,void>
+ class MagickPPExport commentImage : public std::unary_function<Image&,void>
{
public:
commentImage( const std::string &comment_ );
@@ -275,7 +275,7 @@
// Compose an image onto another at specified offset and using
// specified algorithm
- class MagickDLLDecl compositeImage : public std::unary_function<Image&,void>
+ class MagickPPExport compositeImage : public std::unary_function<Image&,void>
{
public:
compositeImage( const Image &compositeImage_,
@@ -297,7 +297,7 @@
};
// Contrast image (enhance intensity differences in image)
- class MagickDLLDecl contrastImage : public std::unary_function<Image&,void>
+ class MagickPPExport contrastImage : public std::unary_function<Image&,void>
{
public:
contrastImage( const size_t sharpen_ );
@@ -309,7 +309,7 @@
};
// Crop image (subregion of original image)
- class MagickDLLDecl cropImage : public std::unary_function<Image&,void>
+ class MagickPPExport cropImage : public std::unary_function<Image&,void>
{
public:
cropImage( const Geometry &geometry_ );
@@ -321,7 +321,7 @@
};
// Cycle image colormap
- class MagickDLLDecl cycleColormapImage : public std::unary_function<Image&,void>
+ class MagickPPExport cycleColormapImage : public std::unary_function<Image&,void>
{
public:
cycleColormapImage( const ::ssize_t amount_ );
@@ -333,7 +333,7 @@
};
// Despeckle image (reduce speckle noise)
- class MagickDLLDecl despeckleImage : public std::unary_function<Image&,void>
+ class MagickPPExport despeckleImage : public std::unary_function<Image&,void>
{
public:
despeckleImage( void );
@@ -347,7 +347,7 @@
// mapping color lookups of the source image to a new destination image
// usally of the same size as the source image, unless 'bestfit' is set to
// true.
- class MagickDLLDecl distortImage : public std::unary_function<Image&,void>
+ class MagickPPExport distortImage : public std::unary_function<Image&,void>
{
public:
distortImage( const Magick::DistortImageMethod method_,
@@ -369,7 +369,7 @@
};
// Draw on image
- class MagickDLLDecl drawImage : public std::unary_function<Image&,void>
+ class MagickPPExport drawImage : public std::unary_function<Image&,void>
{
public:
// Draw on image using a single drawable
@@ -386,7 +386,7 @@
};
// Edge image (hilight edges in image)
- class MagickDLLDecl edgeImage : public std::unary_function<Image&,void>
+ class MagickPPExport edgeImage : public std::unary_function<Image&,void>
{
public:
edgeImage( const double radius_ = 0.0, const double sigma_ = 0.5 );
@@ -399,7 +399,7 @@
};
// Emboss image (hilight edges with 3D effect)
- class MagickDLLDecl embossImage : public std::unary_function<Image&,void>
+ class MagickPPExport embossImage : public std::unary_function<Image&,void>
{
public:
embossImage( void );
@@ -413,7 +413,7 @@
};
// Enhance image (minimize noise)
- class MagickDLLDecl enhanceImage : public std::unary_function<Image&,void>
+ class MagickPPExport enhanceImage : public std::unary_function<Image&,void>
{
public:
enhanceImage( void );
@@ -424,7 +424,7 @@
};
// Equalize image (histogram equalization)
- class MagickDLLDecl equalizeImage : public std::unary_function<Image&,void>
+ class MagickPPExport equalizeImage : public std::unary_function<Image&,void>
{
public:
equalizeImage( void );
@@ -435,7 +435,7 @@
};
// Color to use when filling drawn objects
- class MagickDLLDecl fillColorImage : public std::unary_function<Image&,void>
+ class MagickPPExport fillColorImage : public std::unary_function<Image&,void>
{
public:
fillColorImage( const Color &fillColor_ );
@@ -447,7 +447,7 @@
};
// Flip image (reflect each scanline in the vertical direction)
- class MagickDLLDecl flipImage : public std::unary_function<Image&,void>
+ class MagickPPExport flipImage : public std::unary_function<Image&,void>
{
public:
flipImage( void );
@@ -458,7 +458,7 @@
};
// Flood-fill image with color
- class MagickDLLDecl floodFillColorImage : public std::unary_function<Image&,void>
+ class MagickPPExport floodFillColorImage : public std::unary_function<Image&,void>
{
public:
// Flood-fill color across pixels starting at target-pixel and
@@ -493,7 +493,7 @@
};
// Flood-fill image with texture
- class MagickDLLDecl floodFillTextureImage : public std::unary_function<Image&,void>
+ class MagickPPExport floodFillTextureImage : public std::unary_function<Image&,void>
{
public:
// Flood-fill texture across pixels that match the color of the
@@ -528,7 +528,7 @@
};
// Flop image (reflect each scanline in the horizontal direction)
- class MagickDLLDecl flopImage : public std::unary_function<Image&,void>
+ class MagickPPExport flopImage : public std::unary_function<Image&,void>
{
public:
flopImage( void );
@@ -539,7 +539,7 @@
};
// Frame image
- class MagickDLLDecl frameImage : public std::unary_function<Image&,void>
+ class MagickPPExport frameImage : public std::unary_function<Image&,void>
{
public:
frameImage( const Geometry &geometry_ = frameGeometryDefault );
@@ -557,7 +557,7 @@
};
// Gamma correct image
- class MagickDLLDecl gammaImage : public std::unary_function<Image&,void>
+ class MagickPPExport gammaImage : public std::unary_function<Image&,void>
{
public:
gammaImage( const double gamma_ );
@@ -578,7 +578,7 @@
// The number of neighbor pixels to be included in the convolution
// mask is specified by 'width_'. The standard deviation of the
// gaussian bell curve is specified by 'sigma_'.
- class MagickDLLDecl gaussianBlurImage : public std::unary_function<Image&,void>
+ class MagickPPExport gaussianBlurImage : public std::unary_function<Image&,void>
{
public:
gaussianBlurImage( const double width_, const double sigma_ );
@@ -591,7 +591,7 @@
};
// Apply a color lookup table (Hald CLUT) to the image.
- class MagickDLLDecl haldClutImage : public std::unary_function<Image&,void>
+ class MagickPPExport haldClutImage : public std::unary_function<Image&,void>
{
public:
haldClutImage( const Image &haldClutImage_ );
@@ -603,7 +603,7 @@
};
// Implode image (special effect)
- class MagickDLLDecl implodeImage : public std::unary_function<Image&,void>
+ class MagickPPExport implodeImage : public std::unary_function<Image&,void>
{
public:
implodeImage( const double factor_ = 50 );
@@ -616,7 +616,7 @@
// implements the inverse discrete Fourier transform (IFT) of the image
// either as a magnitude / phase or real / imaginary image pair.
- class MagickDLLDecl inverseFourierTransformImage : public std::unary_function<Image&,void>
+ class MagickPPExport inverseFourierTransformImage : public std::unary_function<Image&,void>
{
public:
inverseFourierTransformImage( const Image &phaseImage_ );
@@ -629,7 +629,7 @@
// Set image validity. Valid images become empty (inValid) if
// argument is false.
- class MagickDLLDecl isValidImage : public std::unary_function<Image&,void>
+ class MagickPPExport isValidImage : public std::unary_function<Image&,void>
{
public:
isValidImage( const bool isValid_ );
@@ -641,7 +641,7 @@
};
// Label image
- class MagickDLLDecl labelImage : public std::unary_function<Image&,void>
+ class MagickPPExport labelImage : public std::unary_function<Image&,void>
{
public:
labelImage( const std::string &label_ );
@@ -654,7 +654,7 @@
// Level image
- class MagickDLLDecl levelImage : public std::unary_function<Image&,void>
+ class MagickPPExport levelImage : public std::unary_function<Image&,void>
{
public:
levelImage( const double black_point,
@@ -670,7 +670,7 @@
};
// Magnify image by integral size
- class MagickDLLDecl magnifyImage : public std::unary_function<Image&,void>
+ class MagickPPExport magnifyImage : public std::unary_function<Image&,void>
{
public:
magnifyImage( void );
@@ -681,7 +681,7 @@
};
// Remap image colors with closest color from reference image
- class MagickDLLDecl mapImage : public std::unary_function<Image&,void>
+ class MagickPPExport mapImage : public std::unary_function<Image&,void>
{
public:
mapImage( const Image &mapImage_ ,
@@ -695,7 +695,7 @@
};
// Floodfill designated area with a matte value
- class MagickDLLDecl matteFloodfillImage : public std::unary_function<Image&,void>
+ class MagickPPExport matteFloodfillImage : public std::unary_function<Image&,void>
{
public:
matteFloodfillImage( const Color &target_ ,
@@ -715,7 +715,7 @@
// Filter image by replacing each pixel component with the median
// color in a circular neighborhood
- class MagickDLLDecl medianConvolveImage : public std::unary_function<Image&,void>
+ class MagickPPExport medianConvolveImage : public std::unary_function<Image&,void>
{
public:
medianConvolveImage( const double radius_ = 0.0 );
@@ -727,7 +727,7 @@
};
// Reduce image by integral size
- class MagickDLLDecl minifyImage : public std::unary_function<Image&,void>
+ class MagickPPExport minifyImage : public std::unary_function<Image&,void>
{
public:
minifyImage( void );
@@ -738,7 +738,7 @@
};
// Modulate percent hue, saturation, and brightness of an image
- class MagickDLLDecl modulateImage : public std::unary_function<Image&,void>
+ class MagickPPExport modulateImage : public std::unary_function<Image&,void>
{
public:
modulateImage( const double brightness_,
@@ -755,7 +755,7 @@
// Negate colors in image. Set grayscale to only negate grayscale
// values in image.
- class MagickDLLDecl negateImage : public std::unary_function<Image&,void>
+ class MagickPPExport negateImage : public std::unary_function<Image&,void>
{
public:
negateImage( const bool grayscale_ = false );
@@ -768,7 +768,7 @@
// Normalize image (increase contrast by normalizing the pixel
// values to span the full range of color values)
- class MagickDLLDecl normalizeImage : public std::unary_function<Image&,void>
+ class MagickPPExport normalizeImage : public std::unary_function<Image&,void>
{
public:
normalizeImage( void );
@@ -779,7 +779,7 @@
};
// Oilpaint image (image looks like oil painting)
- class MagickDLLDecl oilPaintImage : public std::unary_function<Image&,void>
+ class MagickPPExport oilPaintImage : public std::unary_function<Image&,void>
{
public:
oilPaintImage( const double radius_ = 3 );
@@ -797,7 +797,7 @@
// QuantumRange. The defines OpaqueAlpha and TransparentAlpha are
// available to specify completely opaque or completely transparent,
// respectively.
- class MagickDLLDecl alphaImage : public std::unary_function<Image&,void>
+ class MagickPPExport alphaImage : public std::unary_function<Image&,void>
{
public:
alphaImage( const unsigned int alpha_ );
@@ -809,7 +809,7 @@
};
// Change color of opaque pixel to specified pen color.
- class MagickDLLDecl opaqueImage : public std::unary_function<Image&,void>
+ class MagickPPExport opaqueImage : public std::unary_function<Image&,void>
{
public:
opaqueImage( const Color &opaqueColor_,
@@ -823,7 +823,7 @@
};
// Quantize image (reduce number of colors)
- class MagickDLLDecl quantizeImage : public std::unary_function<Image&,void>
+ class MagickPPExport quantizeImage : public std::unary_function<Image&,void>
{
public:
quantizeImage( const bool measureError_ = false );
@@ -836,7 +836,7 @@
// Raise image (lighten or darken the edges of an image to give a
// 3-D raised or lowered effect)
- class MagickDLLDecl raiseImage : public std::unary_function<Image&,void>
+ class MagickPPExport raiseImage : public std::unary_function<Image&,void>
{
public:
raiseImage( const Geometry &geometry_ = raiseGeometryDefault,
@@ -850,7 +850,7 @@
};
// Reduce noise in image using a noise peak elimination filter
- class MagickDLLDecl reduceNoiseImage : public std::unary_function<Image&,void>
+ class MagickPPExport reduceNoiseImage : public std::unary_function<Image&,void>
{
public:
reduceNoiseImage( void );
@@ -864,7 +864,7 @@
};
// Resize image to specified size.
- class MagickDLLDecl resizeImage : public std::unary_function<Image&,void>
+ class MagickPPExport resizeImage : public std::unary_function<Image&,void>
{
public:
resizeImage( const Geometry &geometry_ );
@@ -877,7 +877,7 @@
// Roll image (rolls image vertically and horizontally) by specified
// number of columnms and rows)
- class MagickDLLDecl rollImage : public std::unary_function<Image&,void>
+ class MagickPPExport rollImage : public std::unary_function<Image&,void>
{
public:
rollImage( const Geometry &roll_ );
@@ -892,7 +892,7 @@
};
// Rotate image counter-clockwise by specified number of degrees.
- class MagickDLLDecl rotateImage : public std::unary_function<Image&,void>
+ class MagickPPExport rotateImage : public std::unary_function<Image&,void>
{
public:
rotateImage( const double degrees_ );
@@ -904,7 +904,7 @@
};
// Resize image by using pixel sampling algorithm
- class MagickDLLDecl sampleImage : public std::unary_function<Image&,void>
+ class MagickPPExport sampleImage : public std::unary_function<Image&,void>
{
public:
sampleImage( const Geometry &geometry_ );
@@ -916,7 +916,7 @@
};
// Resize image by using simple ratio algorithm
- class MagickDLLDecl scaleImage : public std::unary_function<Image&,void>
+ class MagickPPExport scaleImage : public std::unary_function<Image&,void>
{
public:
scaleImage( const Geometry &geometry_ );
@@ -931,7 +931,7 @@
// histograms of the color components and identifying units that are
// homogeneous with the fuzzy c-means technique.
// Also uses QuantizeColorSpace and Verbose image attributes
- class MagickDLLDecl segmentImage : public std::unary_function<Image&,void>
+ class MagickPPExport segmentImage : public std::unary_function<Image&,void>
{
public:
segmentImage( const double clusterThreshold_ = 1.0,
@@ -945,7 +945,7 @@
};
// Shade image using distant light source
- class MagickDLLDecl shadeImage : public std::unary_function<Image&,void>
+ class MagickPPExport shadeImage : public std::unary_function<Image&,void>
{
public:
shadeImage( const double azimuth_ = 30,
@@ -961,7 +961,7 @@
};
// Sharpen pixels in image
- class MagickDLLDecl sharpenImage : public std::unary_function<Image&,void>
+ class MagickPPExport sharpenImage : public std::unary_function<Image&,void>
{
public:
sharpenImage( const double radius_ = 1, const double sigma_ = 0.5 );
@@ -974,7 +974,7 @@
};
// Shave pixels from image edges.
- class MagickDLLDecl shaveImage : public std::unary_function<Image&,void>
+ class MagickPPExport shaveImage : public std::unary_function<Image&,void>
{
public:
shaveImage( const Geometry &geometry_ );
@@ -987,7 +987,7 @@
// Shear image (create parallelogram by sliding image by X or Y axis)
- class MagickDLLDecl shearImage : public std::unary_function<Image&,void>
+ class MagickPPExport shearImage : public std::unary_function<Image&,void>
{
public:
shearImage( const double xShearAngle_,
@@ -1002,7 +1002,7 @@
// Solarize image (similar to effect seen when exposing a
// photographic film to light during the development process)
- class MagickDLLDecl solarizeImage : public std::unary_function<Image&,void>
+ class MagickPPExport solarizeImage : public std::unary_function<Image&,void>
{
public:
solarizeImage( const double factor_ );
@@ -1014,7 +1014,7 @@
};
// Splice the background color into the image.
- class MagickDLLDecl spliceImage : public std::unary_function<Image&,void>
+ class MagickPPExport spliceImage : public std::unary_function<Image&,void>
{
public:
spliceImage( const Geometry &geometry_ );
@@ -1026,7 +1026,7 @@
};
// Spread pixels randomly within image by specified ammount
- class MagickDLLDecl spreadImage : public std::unary_function<Image&,void>
+ class MagickPPExport spreadImage : public std::unary_function<Image&,void>
{
public:
spreadImage( const size_t amount_ = 3 );
@@ -1038,7 +1038,7 @@
};
// Add a digital watermark to the image (based on second image)
- class MagickDLLDecl steganoImage : public std::unary_function<Image&,void>
+ class MagickPPExport steganoImage : public std::unary_function<Image&,void>
{
public:
steganoImage( const Image &waterMark_ );
@@ -1051,7 +1051,7 @@
// Create an image which appears in stereo when viewed with red-blue glasses
// (Red image on left, blue on right)
- class MagickDLLDecl stereoImage : public std::unary_function<Image&,void>
+ class MagickPPExport stereoImage : public std::unary_function<Image&,void>
{
public:
stereoImage( const Image &rightImage_ );
@@ -1063,7 +1063,7 @@
};
// Color to use when drawing object outlines
- class MagickDLLDecl strokeColorImage : public std::unary_function<Image&,void>
+ class MagickPPExport strokeColorImage : public std::unary_function<Image&,void>
{
public:
strokeColorImage( const Color &strokeColor_ );
@@ -1075,7 +1075,7 @@
};
// Swirl image (image pixels are rotated by degrees)
- class MagickDLLDecl swirlImage : public std::unary_function<Image&,void>
+ class MagickPPExport swirlImage : public std::unary_function<Image&,void>
{
public:
swirlImage( const double degrees_ );
@@ -1087,7 +1087,7 @@
};
// Channel a texture on image background
- class MagickDLLDecl textureImage : public std::unary_function<Image&,void>
+ class MagickPPExport textureImage : public std::unary_function<Image&,void>
{
public:
textureImage( const Image &texture_ );
@@ -1099,7 +1099,7 @@
};
// Threshold image
- class MagickDLLDecl thresholdImage : public std::unary_function<Image&,void>
+ class MagickPPExport thresholdImage : public std::unary_function<Image&,void>
{
public:
thresholdImage( const double threshold_ );
@@ -1111,7 +1111,7 @@
};
// Transform image based on image and crop geometries
- class MagickDLLDecl transformImage : public std::unary_function<Image&,void>
+ class MagickPPExport transformImage : public std::unary_function<Image&,void>
{
public:
transformImage( const Geometry &imageGeometry_ );
@@ -1127,7 +1127,7 @@
};
// Set image color to transparent
- class MagickDLLDecl transparentImage : public std::unary_function<Image&,void>
+ class MagickPPExport transparentImage : public std::unary_function<Image&,void>
{
public:
transparentImage( const Color& color_ );
@@ -1139,7 +1139,7 @@
};
// Trim edges that are the background color from the image
- class MagickDLLDecl trimImage : public std::unary_function<Image&,void>
+ class MagickPPExport trimImage : public std::unary_function<Image&,void>
{
public:
trimImage( void );
@@ -1150,7 +1150,7 @@
};
// Map image pixels to a sine wave
- class MagickDLLDecl waveImage : public std::unary_function<Image&,void>
+ class MagickPPExport waveImage : public std::unary_function<Image&,void>
{
public:
waveImage( const double amplitude_ = 25.0,
@@ -1164,7 +1164,7 @@
};
// Zoom image to specified size.
- class MagickDLLDecl zoomImage : public std::unary_function<Image&,void>
+ class MagickPPExport zoomImage : public std::unary_function<Image&,void>
{
public:
zoomImage( const Geometry &geometry_ );
@@ -1180,7 +1180,7 @@
//
// Anti-alias Postscript and TrueType fonts (default true)
- class MagickDLLDecl antiAliasImage : public std::unary_function<Image&,void>
+ class MagickPPExport antiAliasImage : public std::unary_function<Image&,void>
{
public:
antiAliasImage( const bool flag_ );
@@ -1192,7 +1192,7 @@
};
// Join images into a single multi-image file
- class MagickDLLDecl adjoinImage : public std::unary_function<Image&,void>
+ class MagickPPExport adjoinImage : public std::unary_function<Image&,void>
{
public:
adjoinImage( const bool flag_ );
@@ -1205,7 +1205,7 @@
// Time in 1/100ths of a second which must expire before displaying
// the next image in an animated sequence.
- class MagickDLLDecl animationDelayImage : public std::unary_function<Image&,void>
+ class MagickPPExport animationDelayImage : public std::unary_function<Image&,void>
{
public:
animationDelayImage( const size_t delay_ );
@@ -1218,7 +1218,7 @@
// Number of iterations to loop an animation (e.g. Netscape loop
// extension) for.
- class MagickDLLDecl animationIterationsImage : public std::unary_function<Image&,void>
+ class MagickPPExport animationIterationsImage : public std::unary_function<Image&,void>
{
public:
animationIterationsImage( const size_t iterations_ );
@@ -1230,7 +1230,7 @@
};
// Image background color
- class MagickDLLDecl backgroundColorImage : public std::unary_function<Image&,void>
+ class MagickPPExport backgroundColorImage : public std::unary_function<Image&,void>
{
public:
backgroundColorImage( const Color &color_ );
@@ -1242,7 +1242,7 @@
};
// Name of texture image to tile onto the image background
- class MagickDLLDecl backgroundTextureImage : public std::unary_function<Image&,void>
+ class MagickPPExport backgroundTextureImage : public std::unary_function<Image&,void>
{
public:
backgroundTextureImage( const std::string &backgroundTexture_ );
@@ -1254,7 +1254,7 @@
};
// Image border color
- class MagickDLLDecl borderColorImage : public std::unary_function<Image&,void>
+ class MagickPPExport borderColorImage : public std::unary_function<Image&,void>
{
public:
borderColorImage( const Color &color_ );
@@ -1266,7 +1266,7 @@
};
// Text bounding-box base color (default none)
- class MagickDLLDecl boxColorImage : public std::unary_function<Image&,void>
+ class MagickPPExport boxColorImage : public std::unary_function<Image&,void>
{
public:
boxColorImage( const Color &boxColor_ );
@@ -1278,7 +1278,7 @@
};
// Chromaticity blue primary point (e.g. x=0.15, y=0.06)
- class MagickDLLDecl chromaBluePrimaryImage : public std::unary_function<Image&,void>
+ class MagickPPExport chromaBluePrimaryImage : public std::unary_function<Image&,void>
{
public:
chromaBluePrimaryImage( const double x_, const double y_ );
@@ -1291,7 +1291,7 @@
};
// Chromaticity green primary point (e.g. x=0.3, y=0.6)
- class MagickDLLDecl chromaGreenPrimaryImage : public std::unary_function<Image&,void>
+ class MagickPPExport chromaGreenPrimaryImage : public std::unary_function<Image&,void>
{
public:
chromaGreenPrimaryImage( const double x_, const double y_ );
@@ -1304,7 +1304,7 @@
};
// Chromaticity red primary point (e.g. x=0.64, y=0.33)
- class MagickDLLDecl chromaRedPrimaryImage : public std::unary_function<Image&,void>
+ class MagickPPExport chromaRedPrimaryImage : public std::unary_function<Image&,void>
{
public:
chromaRedPrimaryImage( const double x_, const double y_ );
@@ -1317,7 +1317,7 @@
};
// Chromaticity white point (e.g. x=0.3127, y=0.329)
- class MagickDLLDecl chromaWhitePointImage : public std::unary_function<Image&,void>
+ class MagickPPExport chromaWhitePointImage : public std::unary_function<Image&,void>
{
public:
chromaWhitePointImage( const double x_, const double y_ );
@@ -1330,7 +1330,7 @@
};
// Colors within this distance are considered equal
- class MagickDLLDecl colorFuzzImage : public std::unary_function<Image&,void>
+ class MagickPPExport colorFuzzImage : public std::unary_function<Image&,void>
{
public:
colorFuzzImage( const double fuzz_ );
@@ -1342,7 +1342,7 @@
};
// Color at colormap position index_
- class MagickDLLDecl colorMapImage : public std::unary_function<Image&,void>
+ class MagickPPExport colorMapImage : public std::unary_function<Image&,void>
{
public:
colorMapImage( const size_t index_, const Color &color_ );
@@ -1356,7 +1356,7 @@
// Composition operator to be used when composition is implicitly used
// (such as for image flattening).
- class MagickDLLDecl composeImage : public std::unary_function<Image&,void>
+ class MagickPPExport composeImage : public std::unary_function<Image&,void>
{
public:
composeImage( const CompositeOperator compose_ );
@@ -1368,7 +1368,7 @@
};
// Compression type
- class MagickDLLDecl compressTypeImage : public std::unary_function<Image&,void>
+ class MagickPPExport compressTypeImage : public std::unary_function<Image&,void>
{
public:
compressTypeImage( const CompressionType compressType_ );
@@ -1380,7 +1380,7 @@
};
// Vertical and horizontal resolution in pixels of the image
- class MagickDLLDecl densityImage : public std::unary_function<Image&,void>
+ class MagickPPExport densityImage : public std::unary_function<Image&,void>
{
public:
densityImage( const Geometry &geomery_ );
@@ -1392,7 +1392,7 @@
};
// Image depth (bits allocated to red/green/blue components)
- class MagickDLLDecl depthImage : public std::unary_function<Image&,void>
+ class MagickPPExport depthImage : public std::unary_function<Image&,void>
{
public:
depthImage( const size_t depth_ );
@@ -1405,7 +1405,7 @@
// Endianness (LSBEndian like Intel or MSBEndian like SPARC) for image
// formats which support endian-specific options.
- class MagickDLLDecl endianImage : public std::unary_function<Image&,void>
+ class MagickPPExport endianImage : public std::unary_function<Image&,void>
{
public:
endianImage( const EndianType endian_ );
@@ -1417,7 +1417,7 @@
};
// Image file name
- class MagickDLLDecl fileNameImage : public std::unary_function<Image&,void>
+ class MagickPPExport fileNameImage : public std::unary_function<Image&,void>
{
public:
fileNameImage( const std::string &fileName_ );
@@ -1429,7 +1429,7 @@
};
// Filter to use when resizing image
- class MagickDLLDecl filterTypeImage : public std::unary_function<Image&,void>
+ class MagickPPExport filterTypeImage : public std::unary_function<Image&,void>
{
public:
filterTypeImage( const FilterTypes filterType_ );
@@ -1441,7 +1441,7 @@
};
// Text rendering font
- class MagickDLLDecl fontImage : public std::unary_function<Image&,void>
+ class MagickPPExport fontImage : public std::unary_function<Image&,void>
{
public:
fontImage( const std::string &font_ );
@@ -1453,7 +1453,7 @@
};
// Font point size
- class MagickDLLDecl fontPointsizeImage : public std::unary_function<Image&,void>
+ class MagickPPExport fontPointsizeImage : public std::unary_function<Image&,void>
{
public:
fontPointsizeImage( const size_t pointsize_ );
@@ -1465,7 +1465,7 @@
};
// GIF disposal method
- class MagickDLLDecl gifDisposeMethodImage : public std::unary_function<Image&,void>
+ class MagickPPExport gifDisposeMethodImage : public std::unary_function<Image&,void>
{
public:
gifDisposeMethodImage( const size_t disposeMethod_ );
@@ -1477,7 +1477,7 @@
};
// Type of interlacing to use
- class MagickDLLDecl interlaceTypeImage : public std::unary_function<Image&,void>
+ class MagickPPExport interlaceTypeImage : public std::unary_function<Image&,void>
{
public:
interlaceTypeImage( const InterlaceType interlace_ );
@@ -1489,7 +1489,7 @@
};
// Linewidth for drawing vector objects (default one)
- class MagickDLLDecl lineWidthImage : public std::unary_function<Image&,void>
+ class MagickPPExport lineWidthImage : public std::unary_function<Image&,void>
{
public:
lineWidthImage( const double lineWidth_ );
@@ -1501,7 +1501,7 @@
};
// File type magick identifier (.e.g "GIF")
- class MagickDLLDecl magickImage : public std::unary_function<Image&,void>
+ class MagickPPExport magickImage : public std::unary_function<Image&,void>
{
public:
magickImage( const std::string &magick_ );
@@ -1513,7 +1513,7 @@
};
// Image supports transparent color
- class MagickDLLDecl matteImage : public std::unary_function<Image&,void>
+ class MagickPPExport matteImage : public std::unary_function<Image&,void>
{
public:
matteImage( const bool matteFlag_ );
@@ -1525,7 +1525,7 @@
};
// Transparent color
- class MagickDLLDecl matteColorImage : public std::unary_function<Image&,void>
+ class MagickPPExport matteColorImage : public std::unary_function<Image&,void>
{
public:
matteColorImage( const Color &matteColor_ );
@@ -1537,7 +1537,7 @@
};
// Indicate that image is black and white
- class MagickDLLDecl monochromeImage : public std::unary_function<Image&,void>
+ class MagickPPExport monochromeImage : public std::unary_function<Image&,void>
{
public:
monochromeImage( const bool monochromeFlag_ );
@@ -1549,7 +1549,7 @@
};
// Pen color
- class MagickDLLDecl penColorImage : public std::unary_function<Image&,void>
+ class MagickPPExport penColorImage : public std::unary_function<Image&,void>
{
public:
penColorImage( const Color &penColor_ );
@@ -1561,7 +1561,7 @@
};
// Pen texture image.
- class MagickDLLDecl penTextureImage : public std::unary_function<Image&,void>
+ class MagickPPExport penTextureImage : public std::unary_function<Image&,void>
{
public:
penTextureImage( const Image &penTexture_ );
@@ -1573,7 +1573,7 @@
};
// Set pixel color at location x & y.
- class MagickDLLDecl pixelColorImage : public std::unary_function<Image&,void>
+ class MagickPPExport pixelColorImage : public std::unary_function<Image&,void>
{
public:
pixelColorImage( const ::ssize_t x_,
@@ -1589,7 +1589,7 @@
};
// Postscript page size.
- class MagickDLLDecl pageImage : public std::unary_function<Image&,void>
+ class MagickPPExport pageImage : public std::unary_function<Image&,void>
{
public:
pageImage( const Geometry &pageSize_ );
@@ -1601,7 +1601,7 @@
};
// JPEG/MIFF/PNG compression level (default 75).
- class MagickDLLDecl qualityImage : public std::unary_function<Image&,void>
+ class MagickPPExport qualityImage : public std::unary_function<Image&,void>
{
public:
qualityImage( const size_t quality_ );
@@ -1613,7 +1613,7 @@
};
// Maximum number of colors to quantize to
- class MagickDLLDecl quantizeColorsImage : public std::unary_function<Image&,void>
+ class MagickPPExport quantizeColorsImage : public std::unary_function<Image&,void>
{
public:
quantizeColorsImage( const size_t colors_ );
@@ -1625,7 +1625,7 @@
};
// Colorspace to quantize in.
- class MagickDLLDecl quantizeColorSpaceImage : public std::unary_function<Image&,void>
+ class MagickPPExport quantizeColorSpaceImage : public std::unary_function<Image&,void>
{
public:
quantizeColorSpaceImage( const ColorspaceType colorSpace_ );
@@ -1637,7 +1637,7 @@
};
// Dither image during quantization (default true).
- class MagickDLLDecl quantizeDitherImage : public std::unary_function<Image&,void>
+ class MagickPPExport quantizeDitherImage : public std::unary_function<Image&,void>
{
public:
quantizeDitherImage( const bool ditherFlag_ );
@@ -1649,7 +1649,7 @@
};
// Quantization tree-depth
- class MagickDLLDecl quantizeTreeDepthImage : public std::unary_function<Image&,void>
+ class MagickPPExport quantizeTreeDepthImage : public std::unary_function<Image&,void>
{
public:
quantizeTreeDepthImage( const size_t treeDepth_ );
@@ -1661,7 +1661,7 @@
};
// The type of rendering intent
- class MagickDLLDecl renderingIntentImage : public std::unary_function<Image&,void>
+ class MagickPPExport renderingIntentImage : public std::unary_function<Image&,void>
{
public:
renderingIntentImage( const RenderingIntent renderingIntent_ );
@@ -1673,7 +1673,7 @@
};
// Units of image resolution
- class MagickDLLDecl resolutionUnitsImage : public std::unary_function<Image&,void>
+ class MagickPPExport resolutionUnitsImage : public std::unary_function<Image&,void>
{
public:
resolutionUnitsImage( const ResolutionType resolutionUnits_ );
@@ -1685,7 +1685,7 @@
};
// Image scene number
- class MagickDLLDecl sceneImage : public std::unary_function<Image&,void>
+ class MagickPPExport sceneImage : public std::unary_function<Image&,void>
{
public:
sceneImage( const size_t scene_ );
@@ -1697,7 +1697,7 @@
};
// adjust the image contrast with a non-linear sigmoidal contrast algorithm
- class MagickDLLDecl sigmoidalContrastImage : public std::unary_function<Image&,void>
+ class MagickPPExport sigmoidalContrastImage : public std::unary_function<Image&,void>
{
public:
sigmoidalContrastImage( const size_t sharpen_,
@@ -1713,7 +1713,7 @@
};
// Width and height of a raw image
- class MagickDLLDecl sizeImage : public std::unary_function<Image&,void>
+ class MagickPPExport sizeImage : public std::unary_function<Image&,void>
{
public:
sizeImage( const Geometry &geometry_ );
@@ -1725,7 +1725,7 @@
};
// stripImage strips an image of all profiles and comments.
- class MagickDLLDecl stripImage : public std::unary_function<Image&,void>
+ class MagickPPExport stripImage : public std::unary_function<Image&,void>
{
public:
stripImage( void );
@@ -1736,7 +1736,7 @@
};
// Subimage of an image sequence
- class MagickDLLDecl subImageImage : public std::unary_function<Image&,void>
+ class MagickPPExport subImageImage : public std::unary_function<Image&,void>
{
public:
subImageImage( const size_t subImage_ );
@@ -1748,7 +1748,7 @@
};
// Number of images relative to the base image
- class MagickDLLDecl subRangeImage : public std::unary_function<Image&,void>
+ class MagickPPExport subRangeImage : public std::unary_function<Image&,void>
{
public:
subRangeImage( const size_t subRange_ );
@@ -1760,7 +1760,7 @@
};
// Image storage type
- class MagickDLLDecl typeImage : public std::unary_function<Image&,void>
+ class MagickPPExport typeImage : public std::unary_function<Image&,void>
{
public:
typeImage( const ImageType type_ );
@@ -1773,7 +1773,7 @@
// Print detailed information about the image
- class MagickDLLDecl verboseImage : public std::unary_function<Image&,void>
+ class MagickPPExport verboseImage : public std::unary_function<Image&,void>
{
public:
verboseImage( const bool verbose_ );
@@ -1785,7 +1785,7 @@
};
// FlashPix viewing parameters
- class MagickDLLDecl viewImage : public std::unary_function<Image&,void>
+ class MagickPPExport viewImage : public std::unary_function<Image&,void>
{
public:
viewImage( const std::string &view_ );
@@ -1798,7 +1798,7 @@
// X11 display to display to, obtain fonts from, or to capture
// image from
- class MagickDLLDecl x11DisplayImage : public std::unary_function<Image&,void>
+ class MagickPPExport x11DisplayImage : public std::unary_function<Image&,void>
{
public:
x11DisplayImage( const std::string &display_ );
diff --git a/Magick++/lib/Magick++/Thread.h b/Magick++/lib/Magick++/Thread.h
index 1389f9c..f646364 100644
--- a/Magick++/lib/Magick++/Thread.h
+++ b/Magick++/lib/Magick++/Thread.h
@@ -31,7 +31,7 @@
namespace Magick
{
// Mutex lock wrapper
- class MagickDLLDecl MutexLock
+ class MagickPPExport MutexLock
{
public:
// Default constructor
@@ -63,7 +63,7 @@
};
// Lock mutex while object is in scope
- class MagickDLLDecl Lock
+ class MagickPPExport Lock
{
public:
// Construct with mutex lock (locks mutex)
diff --git a/Magick++/lib/Magick++/TypeMetric.h b/Magick++/lib/Magick++/TypeMetric.h
index 6ef416d..b84baf7 100644
--- a/Magick++/lib/Magick++/TypeMetric.h
+++ b/Magick++/lib/Magick++/TypeMetric.h
@@ -14,7 +14,7 @@
namespace Magick
{
- class MagickDLLDecl TypeMetric
+ class MagickPPExport TypeMetric
{
friend class Image;
public:
diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 2726a74..60334d7 100644
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -12,7 +12,9 @@
/* #undef AUTOTRACE_DELEGATE */
/* Define if coders and filters are to be built as modules. */
-/* #undef BUILD_MODULES */
+#ifndef MAGICKCORE_BUILD_MODULES
+#define MAGICKCORE_BUILD_MODULES 1
+#endif
/* Define if you have the bzip2 library */
#ifndef MAGICKCORE_BZLIB_DELEGATE
@@ -78,7 +80,9 @@
#endif
/* Define if you have FFTW library */
-/* #undef FFTW_DELEGATE */
+#ifndef MAGICKCORE_FFTW_DELEGATE
+#define MAGICKCORE_FFTW_DELEGATE 1
+#endif
/* Location of filter modules */
#ifndef MAGICKCORE_FILTER_PATH
@@ -432,15 +436,15 @@
#endif
/* Define if you have the <lcms2.h> header file. */
-#ifndef MAGICKCORE_HAVE_LCMS2_H
-#define MAGICKCORE_HAVE_LCMS2_H 1
-#endif
+/* #undef HAVE_LCMS2_H */
/* Define if you have the <lcms2/lcms2.h> header file. */
/* #undef HAVE_LCMS2_LCMS2_H */
/* Define if you have the <lcms.h> header file. */
-/* #undef HAVE_LCMS_H */
+#ifndef MAGICKCORE_HAVE_LCMS_H
+#define MAGICKCORE_HAVE_LCMS_H 1
+#endif
/* Define if you have the <lcms/lcms.h> header file. */
/* #undef HAVE_LCMS_LCMS_H */
@@ -1163,7 +1167,9 @@
#endif
/* Define if you have JBIG library */
-/* #undef JBIG_DELEGATE */
+#ifndef MAGICKCORE_JBIG_DELEGATE
+#define MAGICKCORE_JBIG_DELEGATE 1
+#endif
/* Define if you have JPEG version 2 "Jasper" library */
#ifndef MAGICKCORE_JP2_DELEGATE
@@ -1192,7 +1198,9 @@
#endif
/* Define if you have LQR library */
-/* #undef LQR_DELEGATE */
+#ifndef MAGICKCORE_LQR_DELEGATE
+#define MAGICKCORE_LQR_DELEGATE 1
+#endif
/* Define if using libltdl to support dynamically loadable modules */
#ifndef MAGICKCORE_LTDL_DELEGATE
@@ -1204,7 +1212,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/atlas:/usr/lib/llvm:/usr/lib64/llvm:/usr/lib64/mysql:/usr/lib64/qt-3.3/lib:/usr/lib64/tcl8.5/tclx8.4:/usr/lib64/tcl8.5:/usr/lib/wine/:/usr/lib64/wine/:/usr/lib64/xulrunner-2"
+#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"
#endif
/* The archive extension */
@@ -1255,7 +1263,9 @@
/* #undef NO_MINUS_C_MINUS_O */
/* Define if you have OPENEXR library */
-/* #undef OPENEXR_DELEGATE */
+#ifndef MAGICKCORE_OPENEXR_DELEGATE
+#define MAGICKCORE_OPENEXR_DELEGATE 1
+#endif
/* Define to the address where bug reports for this package should be sent. */
#ifndef MAGICKCORE_PACKAGE_BUGREPORT
@@ -1310,7 +1320,9 @@
#endif
/* Define if you have RSVG library */
-/* #undef RSVG_DELEGATE */
+#ifndef MAGICKCORE_RSVG_DELEGATE
+#define MAGICKCORE_RSVG_DELEGATE 1
+#endif
/* Define to the type of arg 1 for `select'. */
#ifndef MAGICKCORE_SELECT_TYPE_ARG1
@@ -1447,7 +1459,9 @@
/* Define if you have WEBP library */
-/* #undef WEBP_DELEGATE */
+#ifndef MAGICKCORE_WEBP_DELEGATE
+#define MAGICKCORE_WEBP_DELEGATE 1
+#endif
/* Define to use the Windows GDI32 library */
/* #undef WINGDI32_DELEGATE */
@@ -1456,7 +1470,9 @@
/* #undef WITH_DMALLOC */
/* Define if you have WMF library */
-/* #undef WMF_DELEGATE */
+#ifndef MAGICKCORE_WMF_DELEGATE
+#define MAGICKCORE_WMF_DELEGATE 1
+#endif
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
diff --git a/MagickCore/version.h b/MagickCore/version.h
index 21e0545..00e0e8c 100644
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@
*/
#define MagickPackageName "ImageMagick"
#define MagickCopyright "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision "5157"
+#define MagickSVNRevision "exported"
#define MagickLibVersion 0x700
#define MagickLibVersionText "7.0.0"
#define MagickLibVersionNumber 5,0,0