[Python-modules-commits] [pythonmagick] 06/13: Ensure PythonMagick compiles against ImageMagick 7.0.2 and above
Bastien ROUCARIES
broucaries-guest at moszumanska.debian.org
Sun Oct 30 16:52:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository pythonmagick.
commit 6c4df2845bf8a6ebf60ae79479147c5b803f5801
Author: Cristy <mikayla-grace at urban-warrior.org>
Date: Sun Aug 14 15:48:28 2016 -0400
Ensure PythonMagick compiles against ImageMagick 7.0.2 and above
---
ChangeLog | 3 +
configure | 20 ++---
configure.ac | 2 +-
pythonmagick_src/_Blob.cpp | 4 +
pythonmagick_src/_Color.cpp | 19 ++++-
pythonmagick_src/_ColorspaceType.cpp | 4 +
pythonmagick_src/_CompositeOperator.cpp | 22 ++++++
pythonmagick_src/_Drawable.cpp | 8 +-
pythonmagick_src/_DrawableDashArray.cpp | 28 +++++++
pythonmagick_src/_DrawableDashOffset.cpp | 26 +++++++
pythonmagick_src/_DrawableMatte.cpp | 32 ++++++++
pythonmagick_src/_FilterTypes.cpp | 6 ++
pythonmagick_src/_Geometry.cpp | 6 ++
pythonmagick_src/_GravityType.cpp | 2 +
pythonmagick_src/_Image.cpp | 122 +++++++++++++++++++++++++++++++
15 files changed, 287 insertions(+), 17 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1830c03..64a7b01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2015-08-14 0.9.14 Cristy <quetzlzacatenango at image...>
+ * Ensure PythonMagick compiles against ImageMagick 7.0.2 and above.
+
2015-08-12 0.9.13 Cristy <quetzlzacatenango at image...>
* Ensure PythonMagick compiles against Boost 1.60 and above.
diff --git a/configure b/configure
index 78ef178..b29dc1c 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for PythonMagick 0.9.13.
+# Generated by GNU Autoconf 2.69 for PythonMagick 0.9.14.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -587,8 +587,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='PythonMagick'
PACKAGE_TARNAME='PythonMagick'
-PACKAGE_VERSION='0.9.13'
-PACKAGE_STRING='PythonMagick 0.9.13'
+PACKAGE_VERSION='0.9.14'
+PACKAGE_STRING='PythonMagick 0.9.14'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1362,7 +1362,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures PythonMagick 0.9.13 to adapt to many kinds of systems.
+\`configure' configures PythonMagick 0.9.14 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1432,7 +1432,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of PythonMagick 0.9.13:";;
+ short | recursive ) echo "Configuration of PythonMagick 0.9.14:";;
esac
cat <<\_ACEOF
@@ -1577,7 +1577,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-PythonMagick configure 0.9.13
+PythonMagick configure 0.9.14
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2030,7 +2030,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by PythonMagick $as_me 0.9.13, which was
+It was created by PythonMagick $as_me 0.9.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2903,7 +2903,7 @@ fi
# Define the identity of the package.
PACKAGE='PythonMagick'
- VERSION='0.9.13'
+ VERSION='0.9.14'
cat >>confdefs.h <<_ACEOF
@@ -17937,7 +17937,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by PythonMagick $as_me 0.9.13, which was
+This file was extended by PythonMagick $as_me 0.9.14, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -18003,7 +18003,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-PythonMagick config.status 0.9.13
+PythonMagick config.status 0.9.14
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 0318037..99278ef 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.69)
-AC_INIT([PythonMagick],[0.9.13],[],[PythonMagick])
+AC_INIT([PythonMagick],[0.9.14],[],[PythonMagick])
AC_CONFIG_SRCDIR([pythonmagick_src/_PathLinetoAbs.cpp])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
diff --git a/pythonmagick_src/_Blob.cpp b/pythonmagick_src/_Blob.cpp
index 491b7f0..6bd7882 100644
--- a/pythonmagick_src/_Blob.cpp
+++ b/pythonmagick_src/_Blob.cpp
@@ -27,7 +27,11 @@ void Export_pyste_src_Blob()
.def("__init__", &update_wrapper)
.def(init< const Magick::Blob& >())
.def("base64", (void (Magick::Blob::*)(const std::string) )&Magick::Blob::base64)
+#if MagickLibVersion < 0x700
.def("base64", (std::string (Magick::Blob::*)() )&Magick::Blob::base64)
+#else
+ .def("base64", (std::string (Magick::Blob::*)() const )&Magick::Blob::base64)
+#endif
.def("update", &update_wrapper)
.def("updateNoCopy", &updateNoCopy_wrapper)
.def("length", &Magick::Blob::length)
diff --git a/pythonmagick_src/_Color.cpp b/pythonmagick_src/_Color.cpp
index 92d1481..ee52d98 100644
--- a/pythonmagick_src/_Color.cpp
+++ b/pythonmagick_src/_Color.cpp
@@ -18,6 +18,7 @@ void Export_pyste_src_Color()
.def(init< const std::string& >())
.def(init< const char* >())
.def(init< const Magick::Color& >())
+#if MagickLibVersion < 0x700
.def(init< const MagickCore::PixelPacket& >())
.def("redQuantum", (void (Magick::Color::*)(MagickCore::Quantum) )&Magick::Color::redQuantum)
.def("redQuantum", (MagickCore::Quantum (Magick::Color::*)() const)&Magick::Color::redQuantum)
@@ -29,14 +30,27 @@ void Export_pyste_src_Color()
.def("alphaQuantum", (MagickCore::Quantum (Magick::Color::*)() const)&Magick::Color::alphaQuantum)
.def("alpha", (void (Magick::Color::*)(double) )&Magick::Color::alpha)
.def("alpha", (double (Magick::Color::*)() const)&Magick::Color::alpha)
- .def("isValid", (void (Magick::Color::*)(bool) )&Magick::Color::isValid)
- .def("isValid", (bool (Magick::Color::*)() const)&Magick::Color::isValid)
.def("intensity", &Magick::Color::intensity)
.def("scaleDoubleToQuantum", &Magick::Color::scaleDoubleToQuantum)
.def("scaleQuantumToDouble", (double (*)(const MagickCore::Quantum))&Magick::Color::scaleQuantumToDouble)
.def("scaleQuantumToDouble", (double (*)(const double))&Magick::Color::scaleQuantumToDouble)
.staticmethod("scaleDoubleToQuantum")
.staticmethod("scaleQuantumToDouble")
+ .def("to_MagickCore_PixelPacket", &Magick::Color::operator MagickCore::PixelPacket)
+#else
+ .def(init< const MagickCore::PixelInfo& >())
+ .def("quantumRed", (void (Magick::Color::*)(MagickCore::Quantum) )&Magick::Color::quantumRed)
+ .def("quantumRed", (MagickCore::Quantum (Magick::Color::*)() const)&Magick::Color::quantumRed)
+ .def("quantumGreen", (void (Magick::Color::*)(MagickCore::Quantum) )&Magick::Color::quantumGreen)
+ .def("quantumGreen", (MagickCore::Quantum (Magick::Color::*)() const)&Magick::Color::quantumGreen)
+ .def("quantumBlue", (void (Magick::Color::*)(MagickCore::Quantum) )&Magick::Color::quantumBlue)
+ .def("quantumBlue", (MagickCore::Quantum (Magick::Color::*)() const)&Magick::Color::quantumBlue)
+ .def("quantumAlpha", (void (Magick::Color::*)(MagickCore::Quantum) )&Magick::Color::quantumAlpha)
+ .def("quantumAlpha", (MagickCore::Quantum (Magick::Color::*)() const)&Magick::Color::quantumAlpha)
+ .def("to_MagickCore_PixelInfo", &Magick::Color::operator MagickCore::PixelInfo)
+#endif
+ .def("isValid", (void (Magick::Color::*)(bool) )&Magick::Color::isValid)
+ .def("isValid", (bool (Magick::Color::*)() const)&Magick::Color::isValid)
.def( self > self )
.def( self < self )
.def( self == self )
@@ -44,7 +58,6 @@ void Export_pyste_src_Color()
.def( self <= self )
.def( self >= self )
.def("to_std_string", &Magick::Color::operator std::string)
- .def("to_MagickCore_PixelPacket", &Magick::Color::operator MagickCore::PixelPacket)
;
implicitly_convertible<std::string,Magick::Color>();}
diff --git a/pythonmagick_src/_ColorspaceType.cpp b/pythonmagick_src/_ColorspaceType.cpp
index c322bb9..f8f1feb 100644
--- a/pythonmagick_src/_ColorspaceType.cpp
+++ b/pythonmagick_src/_ColorspaceType.cpp
@@ -30,9 +30,13 @@ void Export_pyste_src_ColorspaceType()
.value("HSBColorspace", MagickCore::HSBColorspace)
.value("HSLColorspace", MagickCore::HSLColorspace)
.value("HWBColorspace", MagickCore::HWBColorspace)
+#if MagickLibVersion < 0x700
.value("Rec601LumaColorspace", MagickCore::Rec601LumaColorspace)
+#endif
.value("Rec601YCbCrColorspace", MagickCore::Rec601YCbCrColorspace)
+#if MagickLibVersion < 0x700
.value("Rec709LumaColorspace", MagickCore::Rec709LumaColorspace)
+#endif
.value("Rec709YCbCrColorspace", MagickCore::Rec709YCbCrColorspace)
.value("LogColorspace", MagickCore::LogColorspace)
.value("CMYColorspace", MagickCore::CMYColorspace)
diff --git a/pythonmagick_src/_CompositeOperator.cpp b/pythonmagick_src/_CompositeOperator.cpp
index 85305c7..78a6874 100644
--- a/pythonmagick_src/_CompositeOperator.cpp
+++ b/pythonmagick_src/_CompositeOperator.cpp
@@ -31,7 +31,12 @@ void Export_pyste_src_CompositeOperator()
.value("DarkenCompositeOp", MagickCore::DarkenCompositeOp)
.value("OverlayCompositeOp", MagickCore::OverlayCompositeOp)
.value("CopyYellowCompositeOp", MagickCore::CopyYellowCompositeOp)
+#if MagickLibVersion < 0x700
.value("MinusCompositeOp", MagickCore::MinusCompositeOp)
+#else
+ .value("MinusDstCompositeOp", MagickCore::MinusDstCompositeOp)
+ .value("MinusSrcCompositeOp", MagickCore::MinusSrcCompositeOp)
+#endif
.value("UndefinedCompositeOp", MagickCore::UndefinedCompositeOp)
.value("HueCompositeOp", MagickCore::HueCompositeOp)
.value("DstOutCompositeOp", MagickCore::DstOutCompositeOp)
@@ -45,18 +50,31 @@ void Export_pyste_src_CompositeOperator()
.value("SrcInCompositeOp", MagickCore::SrcInCompositeOp)
.value("CopyCompositeOp", MagickCore::CopyCompositeOp)
.value("DstOverCompositeOp", MagickCore::DstOverCompositeOp)
+#if MagickLibVersion < 0x700
.value("CopyOpacityCompositeOp", MagickCore::CopyOpacityCompositeOp)
+#else
+ .value("CopyAlphaCompositeOp", MagickCore::CopyAlphaCompositeOp)
+#endif
.value("ColorBurnCompositeOp", MagickCore::ColorBurnCompositeOp)
.value("DstCompositeOp", MagickCore::DstCompositeOp)
.value("CopyBlueCompositeOp", MagickCore::CopyBlueCompositeOp)
.value("DissolveCompositeOp", MagickCore::DissolveCompositeOp)
.value("MultiplyCompositeOp", MagickCore::MultiplyCompositeOp)
+#if MagickLibVersion < 0x700
.value("DivideCompositeOp", MagickCore::DivideCompositeOp)
+#else
+ .value("DivideDstCompositeOp", MagickCore::DivideDstCompositeOp)
+ .value("DivideSrcCompositeOp", MagickCore::DivideSrcCompositeOp)
+#endif
.value("ColorDodgeCompositeOp", MagickCore::ColorDodgeCompositeOp)
.value("SrcOverCompositeOp", MagickCore::SrcOverCompositeOp)
.value("AtopCompositeOp", MagickCore::AtopCompositeOp)
.value("SoftLightCompositeOp", MagickCore::SoftLightCompositeOp)
+#if MagickLibVersion < 0x700
.value("AddCompositeOp", MagickCore::AddCompositeOp)
+#else
+ .value("ModulusAddCompositeOp", MagickCore::ModulusAddCompositeOp)
+#endif
.value("OverCompositeOp", MagickCore::OverCompositeOp)
.value("SrcCompositeOp", MagickCore::SrcCompositeOp)
.value("ClearCompositeOp", MagickCore::ClearCompositeOp)
@@ -65,7 +83,11 @@ void Export_pyste_src_CompositeOperator()
.value("CopyGreenCompositeOp", MagickCore::CopyGreenCompositeOp)
.value("LightenCompositeOp", MagickCore::LightenCompositeOp)
.value("ReplaceCompositeOp", MagickCore::ReplaceCompositeOp)
+#if MagickLibVersion < 0x700
.value("SubtractCompositeOp", MagickCore::SubtractCompositeOp)
+#else
+ .value("ModulusSubtractCompositeOp", MagickCore::ModulusSubtractCompositeOp)
+#endif
.value("ColorizeCompositeOp", MagickCore::ColorizeCompositeOp)
.value("CopyRedCompositeOp", MagickCore::CopyRedCompositeOp)
.value("XorCompositeOp", MagickCore::XorCompositeOp)
diff --git a/pythonmagick_src/_Drawable.cpp b/pythonmagick_src/_Drawable.cpp
index b605052..945d91a 100644
--- a/pythonmagick_src/_Drawable.cpp
+++ b/pythonmagick_src/_Drawable.cpp
@@ -15,15 +15,17 @@ using namespace boost::python;
// Module ======================================================================
void Export_pyste_src_Drawable()
{
- class_< Magick::Drawable >("Drawable", init< >())
- .def(init< const Magick::DrawableBase& >())
- .def(init< const Magick::Drawable& >())
+ class_< Magick::Drawable >("Drawable", init< >() )
+ .def(init< const Magick::DrawableBase& >() )
+ .def(init< const Magick::Drawable& >() )
+#if MagickLibVersion < 0x700
.def( self != self )
.def( self == self )
.def( self < self )
.def( self > self )
.def( self <= self )
.def( self >= self )
+#endif
;
}
diff --git a/pythonmagick_src/_DrawableDashArray.cpp b/pythonmagick_src/_DrawableDashArray.cpp
index f1f75aa..9aca81c 100644
--- a/pythonmagick_src/_DrawableDashArray.cpp
+++ b/pythonmagick_src/_DrawableDashArray.cpp
@@ -14,6 +14,8 @@ using namespace boost::python;
namespace {
+#if MagickLibVersion < 0x700
+
struct Magick_DrawableDashArray_Wrapper: Magick::DrawableDashArray
{
Magick_DrawableDashArray_Wrapper(PyObject* py_self_, const double* p0):
@@ -42,4 +44,30 @@ void Export_pyste_src_DrawableDashArray()
;
implicitly_convertible<Magick::DrawableDashArray,Magick::Drawable>();
}
+#else
+struct Magick_DrawableStrokeDashArray_Wrapper: Magick::DrawableStrokeDashArray
+{
+ Magick_DrawableStrokeDashArray_Wrapper(PyObject* py_self_, const double* p0):
+ Magick::DrawableStrokeDashArray(p0), py_self(py_self_) {}
+
+ Magick_DrawableStrokeDashArray_Wrapper(PyObject* py_self_, const Magick::DrawableStrokeDashArray& p0):
+ Magick::DrawableStrokeDashArray(p0), py_self(py_self_) {}
+
+
+ PyObject* py_self;
+};
+
+
+}// namespace
+
+
+// Module ======================================================================
+void Export_pyste_src_DrawableStrokeDashArray()
+{
+ class_< Magick::DrawableStrokeDashArray, Magick_DrawableStrokeDashArray_Wrapper >("DrawableStrokeDashArray", init< const double* >())
+ .def(init< const Magick::DrawableStrokeDashArray& >())
+ ;
+implicitly_convertible<Magick::DrawableStrokeDashArray,Magick::Drawable>();
+}
+#endif
diff --git a/pythonmagick_src/_DrawableDashOffset.cpp b/pythonmagick_src/_DrawableDashOffset.cpp
index e250abb..2e5458a 100644
--- a/pythonmagick_src/_DrawableDashOffset.cpp
+++ b/pythonmagick_src/_DrawableDashOffset.cpp
@@ -12,6 +12,7 @@
// Using =======================================================================
using namespace boost::python;
+#if MagickLibVersion < 0x700
namespace {
struct Magick_DrawableDashOffset_Wrapper: Magick::DrawableDashOffset
@@ -36,4 +37,29 @@ void Export_pyste_src_DrawableDashOffset()
;
implicitly_convertible<Magick::DrawableDashOffset,Magick::Drawable>();
}
+#else
+namespace {
+
+struct Magick_DrawableStrokeDashOffset_Wrapper: Magick::DrawableStrokeDashOffset
+{
+ Magick_DrawableStrokeDashOffset_Wrapper(PyObject* py_self_, const double p0):
+ Magick::DrawableStrokeDashOffset(p0), py_self(py_self_) {}
+
+
+ PyObject* py_self;
+};
+
+}// namespace
+
+
+// Module ======================================================================
+void Export_pyste_src_DrawableStrokeDashOffset()
+{
+ class_< Magick::DrawableStrokeDashOffset, boost::noncopyable, Magick_DrawableStrokeDashOffset_Wrapper >("DrawableStrokeDashOffset", init< const double >())
+ .def("offset", (void (Magick::DrawableStrokeDashOffset::*)(const double) )&Magick::DrawableStrokeDashOffset::offset)
+ .def("offset", (double (Magick::DrawableStrokeDashOffset::*)() const)&Magick::DrawableStrokeDashOffset::offset)
+ ;
+implicitly_convertible<Magick::DrawableStrokeDashOffset,Magick::Drawable>();
+}
+#endif
diff --git a/pythonmagick_src/_DrawableMatte.cpp b/pythonmagick_src/_DrawableMatte.cpp
index 5381378..0e3c6ed 100644
--- a/pythonmagick_src/_DrawableMatte.cpp
+++ b/pythonmagick_src/_DrawableMatte.cpp
@@ -12,8 +12,10 @@
// Using =======================================================================
using namespace boost::python;
+#if MagickLibVersion < 0x700
namespace {
+
struct Magick_DrawableMatte_Wrapper: Magick::DrawableMatte
{
Magick_DrawableMatte_Wrapper(PyObject* py_self_, double p0, double p1, MagickCore::PaintMethod p2):
@@ -40,4 +42,34 @@ void Export_pyste_src_DrawableMatte()
;
implicitly_convertible<Magick::DrawableMatte,Magick::Drawable>();
}
+#else
+namespace {
+
+
+struct Magick_DrawableAlpha_Wrapper: Magick::DrawableAlpha
+{
+ Magick_DrawableAlpha_Wrapper(PyObject* py_self_, double p0, double p1, MagickCore::PaintMethod p2):
+ Magick::DrawableAlpha(p0, p1, p2), py_self(py_self_) {}
+
+
+ PyObject* py_self;
+};
+
+}// namespace
+
+
+// Module ======================================================================
+void Export_pyste_src_DrawableAlpha()
+{
+ class_< Magick::DrawableAlpha, boost::noncopyable, Magick_DrawableAlpha_Wrapper >("DrawableAlpha", init< double, double, MagickCore::PaintMethod >())
+ .def("x", (void (Magick::DrawableAlpha::*)(double) )&Magick::DrawableAlpha::x)
+ .def("x", (double (Magick::DrawableAlpha::*)() const)&Magick::DrawableAlpha::x)
+ .def("y", (void (Magick::DrawableAlpha::*)(double) )&Magick::DrawableAlpha::y)
+ .def("y", (double (Magick::DrawableAlpha::*)() const)&Magick::DrawableAlpha::y)
+ .def("paintMethod", (void (Magick::DrawableAlpha::*)(MagickCore::PaintMethod) )&Magick::DrawableAlpha::paintMethod)
+ .def("paintMethod", (MagickCore::PaintMethod (Magick::DrawableAlpha::*)() const)&Magick::DrawableAlpha::paintMethod)
+ ;
+implicitly_convertible<Magick::DrawableAlpha,Magick::Drawable>();
+}
+#endif
diff --git a/pythonmagick_src/_FilterTypes.cpp b/pythonmagick_src/_FilterTypes.cpp
index 6760edb..7683442 100644
--- a/pythonmagick_src/_FilterTypes.cpp
+++ b/pythonmagick_src/_FilterTypes.cpp
@@ -10,9 +10,15 @@
using namespace boost::python;
// Module ======================================================================
+#if MagickLibVersion < 0x700
void Export_pyste_src_FilterTypes()
{
enum_< MagickCore::FilterTypes >("FilterTypes")
+#else
+void Export_pyste_src_FilterType()
+{
+ enum_< MagickCore::FilterType >("FilterType")
+#endif
.value("BesselFilter", MagickCore::BesselFilter)
.value("QuadraticFilter", MagickCore::QuadraticFilter)
.value("BartlettFilter", MagickCore::BartlettFilter)
diff --git a/pythonmagick_src/_Geometry.cpp b/pythonmagick_src/_Geometry.cpp
index 93b91ff..f0761a8 100644
--- a/pythonmagick_src/_Geometry.cpp
+++ b/pythonmagick_src/_Geometry.cpp
@@ -13,7 +13,11 @@ using namespace boost::python;
void Export_pyste_src_Geometry()
{
class_< Magick::Geometry >("Geometry", init< >())
+#if MagickLibVersion < 0x700
.def(init< size_t, size_t, optional< size_t, size_t, bool, bool > >())
+#else
+ .def(init< size_t, size_t, optional< size_t, size_t > >())
+#endif
.def(init< const std::string& >())
.def(init< const char* >())
.def(init< const Magick::Geometry& >())
@@ -26,10 +30,12 @@ void Export_pyste_src_Geometry()
.def("xOff", (::ssize_t (Magick::Geometry::*)() const)&Magick::Geometry::xOff)
.def("yOff", (void (Magick::Geometry::*)(::ssize_t) )&Magick::Geometry::yOff)
.def("yOff", (::ssize_t (Magick::Geometry::*)() const)&Magick::Geometry::yOff)
+#if MagickLibVersion < 0x700
.def("xNegative", (void (Magick::Geometry::*)(bool) )&Magick::Geometry::xNegative)
.def("xNegative", (bool (Magick::Geometry::*)() const)&Magick::Geometry::xNegative)
.def("yNegative", (void (Magick::Geometry::*)(bool) )&Magick::Geometry::yNegative)
.def("yNegative", (bool (Magick::Geometry::*)() const)&Magick::Geometry::yNegative)
+#endif
.def("percent", (void (Magick::Geometry::*)(bool) )&Magick::Geometry::percent)
.def("percent", (bool (Magick::Geometry::*)() const)&Magick::Geometry::percent)
.def("aspect", (void (Magick::Geometry::*)(bool) )&Magick::Geometry::aspect)
diff --git a/pythonmagick_src/_GravityType.cpp b/pythonmagick_src/_GravityType.cpp
index 05ad22b..76e6cbd 100644
--- a/pythonmagick_src/_GravityType.cpp
+++ b/pythonmagick_src/_GravityType.cpp
@@ -17,7 +17,9 @@ void Export_pyste_src_GravityType()
.value("UndefinedGravity", MagickCore::UndefinedGravity)
.value("CenterGravity", MagickCore::CenterGravity)
.value("SouthWestGravity", MagickCore::SouthWestGravity)
+#if MagickLibVersion < 0x700
.value("StaticGravity", MagickCore::StaticGravity)
+#endif
.value("SouthGravity", MagickCore::SouthGravity)
.value("ForgetGravity", MagickCore::ForgetGravity)
.value("EastGravity", MagickCore::EastGravity)
diff --git a/pythonmagick_src/_Image.cpp b/pythonmagick_src/_Image.cpp
index 22c2728..cd947f4 100644
--- a/pythonmagick_src/_Image.cpp
+++ b/pythonmagick_src/_Image.cpp
@@ -93,7 +93,11 @@ void Export_pyste_src_Image()
.def("colorize", (void (Magick::Image::*)(const unsigned int, const unsigned int, const unsigned int, const Magick::Color&) )&Magick::Image::colorize)
.def("colorize", (void (Magick::Image::*)(const unsigned int, const Magick::Color&) )&Magick::Image::colorize)
.def("comment", (void (Magick::Image::*)(const std::string&) )&Magick::Image::comment)
+#if MagickLibVersion < 0x700
.def("compare", (bool (Magick::Image::*)(const Magick::Image&) )&Magick::Image::compare)
+#else
+ .def("compare", (bool (Magick::Image::*)(const Magick::Image&) const)&Magick::Image::compare)
+#endif
.def("composite", (void (Magick::Image::*)(const Magick::Image&, const ::ssize_t, const ::ssize_t, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_3_4())
.def("composite", (void (Magick::Image::*)(const Magick::Image&, const Magick::Geometry&, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_2_3())
.def("composite", (void (Magick::Image::*)(const Magick::Image&, const MagickCore::GravityType, const MagickCore::CompositeOperator) )&Magick::Image::composite, Magick_Image_composite_overloads_2_3())
@@ -104,24 +108,71 @@ void Export_pyste_src_Image()
.def("despeckle", &Magick::Image::despeckle)
.def("display", &Magick::Image::display)
.def("draw", (void (Magick::Image::*)(const Magick::Drawable&) )&Magick::Image::draw)
+ .def("draw", (void (Magick::Image::*)(const Magick::Drawable&) )&Magick::Image::draw)
+#if MagickLibVersion < 0x700
.def("draw", (void (Magick::Image::*)(const std::list<Magick::Drawable,std::allocator<Magick::Drawable> >&) )&Magick::Image::draw)
+#else
+ .def("draw", (void (Magick::Image::*)(const std::vector<Magick::Drawable>&) )&Magick::Image::draw)
+#endif
.def("edge", &Magick::Image::edge, Magick_Image_edge_overloads_0_1())
.def("emboss", &Magick::Image::emboss, Magick_Image_emboss_overloads_0_2())
.def("enhance", &Magick::Image::enhance)
.def("equalize", &Magick::Image::equalize)
.def("erase", &Magick::Image::erase)
.def("flip", &Magick::Image::flip)
+#if MagickLibVersion < 0x700
.def("floodFillColor", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Color&) )&Magick::Image::floodFillColor)
+#else
+ .def("floodFillColor", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Color&, const bool) )&Magick::Image::floodFillColor)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillColor", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Color&) )&Magick::Image::floodFillColor)
+#else
+ .def("floodFillColor", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Color&, const bool) )&Magick::Image::floodFillColor)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillColor", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Color&, const Magick::Color&) )&Magick::Image::floodFillColor)
+#else
+ .def("floodFillColor", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Color&, const Magick::Color&,const bool) )&Magick::Image::floodFillColor)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillColor", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Color&, const Magick::Color&) )&Magick::Image::floodFillColor)
+#else
+ .def("floodFillColor", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Color&, const Magick::Color&, const bool) )&Magick::Image::floodFillColor)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillOpacity", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const unsigned int, const bool) ) &Magick::Image::floodFillOpacity)
+#else
+ .def("floodFillAlpha", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const unsigned int, const bool) ) &Magick::Image::floodFillAlpha)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillOpacity", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const unsigned int, const Magick::PaintMethod) ) &Magick::Image::floodFillOpacity)
+#else
+ .def("floodFillAlpha", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const unsigned int, const Magick::Color&, const bool) ) &Magick::Image::floodFillAlpha)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillOpacity", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const unsigned int, const Magick::Color&, const bool) ) &Magick::Image::floodFillOpacity)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillTexture", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Image&) )&Magick::Image::floodFillTexture)
+#else
+ .def("floodFillTexture", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Image&,const bool) )&Magick::Image::floodFillTexture)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillTexture", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Image&) )&Magick::Image::floodFillTexture)
+#else
+ .def("floodFillTexture", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Image&,const bool) )&Magick::Image::floodFillTexture)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillTexture", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Image&, const Magick::Color&) )&Magick::Image::floodFillTexture)
+#else
+ .def("floodFillTexture", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Image&, const Magick::Color&, const bool) )&Magick::Image::floodFillTexture)
+#endif
+#if MagickLibVersion < 0x700
.def("floodFillTexture", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Image&, const Magick::Color&) )&Magick::Image::floodFillTexture)
+#else
+ .def("floodFillTexture", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Image&, const Magick::Color&,const bool) )&Magick::Image::floodFillTexture)
+#endif
.def("flop", &Magick::Image::flop)
.def("frame", (void (Magick::Image::*)(const Magick::Geometry&) )&Magick::Image::frame, Magick_Image_frame_overloads_0_1())
.def("frame", (void (Magick::Image::*)(const size_t, const size_t, const ::ssize_t, const ::ssize_t) )&Magick::Image::frame, Magick_Image_frame_overloads_2_4())
@@ -132,14 +183,18 @@ void Export_pyste_src_Image()
.def("label", (void (Magick::Image::*)(const std::string&) )&Magick::Image::label)
.def("magnify", &Magick::Image::magnify)
.def("map", &Magick::Image::map, Magick_Image_map_overloads_1_2())
+#if MagickLibVersion < 0x700
.def("matteFloodfill", &Magick::Image::matteFloodfill)
+#endif
.def("medianFilter", &Magick::Image::medianFilter, Magick_Image_medianFilter_overloads_0_1())
.def("minify", &Magick::Image::minify)
.def("modulate", &Magick::Image::modulate)
.def("negate", &Magick::Image::negate, Magick_Image_negate_overloads_0_1())
.def("normalize", &Magick::Image::normalize)
.def("oilPaint", &Magick::Image::oilPaint, Magick_Image_oilPaint_overloads_0_1())
+#if MagickLibVersion < 0x700
.def("opacity", &Magick::Image::opacity)
+#endif
.def("opaque", &Magick::Image::opaque)
.def("ping", (void (Magick::Image::*)(const std::string&) )&Magick::Image::ping)
.def("ping", (void (Magick::Image::*)(const Magick::Blob&) )&Magick::Image::ping)
@@ -154,7 +209,11 @@ void Export_pyste_src_Image()
.def("read", (void (Magick::Image::*)(const Magick::Blob&, const Magick::Geometry&, const size_t, const std::string&) )&Magick::Image::read)
.def("read", (void (Magick::Image::*)(const Magick::Blob&, const Magick::Geometry&, const std::string&) )&Magick::Image::read)
.def("reduceNoise", (void (Magick::Image::*)() )&Magick::Image::reduceNoise)
+#if MagickLibVersion < 0x700
.def("reduceNoise", (void (Magick::Image::*)(const double) )&Magick::Image::reduceNoise)
+#else
+ .def("reduceNoise", (void (Magick::Image::*)(const size_t) )&Magick::Image::reduceNoise)
+#endif
.def("resize", &Magick::Image::resize)
.def("roll", (void (Magick::Image::*)(const Magick::Geometry&) )&Magick::Image::roll)
.def("roll", (void (Magick::Image::*)(const size_t, const size_t) )&Magick::Image::roll)
@@ -174,8 +233,10 @@ void Export_pyste_src_Image()
.def("swirl", &Magick::Image::swirl)
.def("texture", &Magick::Image::texture)
.def("threshold", &Magick::Image::threshold)
+#if MagickLibVersion < 0x700
.def("transform", (void (Magick::Image::*)(const Magick::Geometry&) )&Magick::Image::transform)
.def("transform", (void (Magick::Image::*)(const Magick::Geometry&, const Magick::Geometry&) )&Magick::Image::transform)
+#endif
.def("transparent", &Magick::Image::transparent)
.def("trim", &Magick::Image::trim)
.def("type", (void (Magick::Image::*)(const MagickCore::ImageType) )&Magick::Image::type)
@@ -188,8 +249,10 @@ void Export_pyste_src_Image()
.def("zoom", &Magick::Image::zoom)
.def("adjoin", (void (Magick::Image::*)(const bool) )&Magick::Image::adjoin)
.def("adjoin", (bool (Magick::Image::*)() const)&Magick::Image::adjoin)
+#if MagickLibVersion < 0x700
.def("antiAlias", (void (Magick::Image::*)(const bool) )&Magick::Image::antiAlias)
.def("antiAlias", (bool (Magick::Image::*)() const)&Magick::Image::antiAlias)
+#endif
.def("animationDelay", (void (Magick::Image::*)(const size_t) )&Magick::Image::animationDelay)
.def("animationDelay", (size_t (Magick::Image::*)() const)&Magick::Image::animationDelay)
.def("animationIterations", (void (Magick::Image::*)(const size_t) )&Magick::Image::animationIterations)
@@ -208,19 +271,43 @@ void Export_pyste_src_Image()
.def("boundingBox", &Magick::Image::boundingBox)
.def("boxColor", (void (Magick::Image::*)(const Magick::Color&) )&Magick::Image::boxColor)
.def("boxColor", (Magick::Color (Magick::Image::*)() const)&Magick::Image::boxColor)
+#if MagickLibVersion < 0x700
.def("cacheThreshold", &Magick::Image::cacheThreshold)
+#endif
+#if MagickLibVersion < 0x700
.def("chromaBluePrimary", (void (Magick::Image::*)(const double, const double) )&Magick::Image::chromaBluePrimary)
.def("chromaBluePrimary", (void (Magick::Image::*)(double*, double*) const)&Magick::Image::chromaBluePrimary)
+#else
+ .def("chromaBluePrimary", (void (Magick::Image::*)(const double, const double,const double) )&Magick::Image::chromaBluePrimary)
+ .def("chromaBluePrimary", (void (Magick::Image::*)(double*, double*,double*) const)&Magick::Image::chromaBluePrimary)
+#endif
+#if MagickLibVersion < 0x700
.def("chromaGreenPrimary", (void (Magick::Image::*)(const double, const double) )&Magick::Image::chromaGreenPrimary)
.def("chromaGreenPrimary", (void (Magick::Image::*)(double*, double*) const)&Magick::Image::chromaGreenPrimary)
+#else
+ .def("chromaGreenPrimary", (void (Magick::Image::*)(const double, const double,const double) )&Magick::Image::chromaGreenPrimary)
+ .def("chromaGreenPrimary", (void (Magick::Image::*)(double*, double*,double *) const)&Magick::Image::chromaGreenPrimary)
+#endif
+#if MagickLibVersion < 0x700
.def("chromaRedPrimary", (void (Magick::Image::*)(const double, const double) )&Magick::Image::chromaRedPrimary)
.def("chromaRedPrimary", (void (Magick::Image::*)(double*, double*) const)&Magick::Image::chromaRedPrimary)
+#else
+ .def("chromaRedPrimary", (void (Magick::Image::*)(const double, const double, const double) )&Magick::Image::chromaRedPrimary)
+ .def("chromaRedPrimary", (void (Magick::Image::*)(double*, double*,double *) const)&Magick::Image::chromaRedPrimary)
+#endif
+#if MagickLibVersion < 0x700
.def("chromaWhitePoint", (void (Magick::Image::*)(const double, const double) )&Magick::Image::chromaWhitePoint)
.def("chromaWhitePoint", (void (Magick::Image::*)(double*, double*) const)&Magick::Image::chromaWhitePoint)
+#else
+ .def("chromaWhitePoint", (void (Magick::Image::*)(const double, const double, const double) )&Magick::Image::chromaWhitePoint)
+ .def("chromaWhitePoint", (void (Magick::Image::*)(double*, double*, double *) const)&Magick::Image::chromaWhitePoint)
+#endif
.def("classType", (void (Magick::Image::*)(const MagickCore::ClassType) )&Magick::Image::classType)
.def("classType", (MagickCore::ClassType (Magick::Image::*)() const)&Magick::Image::classType)
+#if MagickLibVersion < 0x700
.def("clipMask", (void (Magick::Image::*)(const Magick::Image&) )&Magick::Image::clipMask)
.def("clipMask", (Magick::Image (Magick::Image::*)() const)&Magick::Image::clipMask)
+#endif
.def("colorFuzz", (void (Magick::Image::*)(const double) )&Magick::Image::colorFuzz)
.def("colorFuzz", (double (Magick::Image::*)() const)&Magick::Image::colorFuzz)
.def("colorMap", (void (Magick::Image::*)(const size_t, const Magick::Color&) )&Magick::Image::colorMap)
@@ -241,8 +328,13 @@ void Export_pyste_src_Image()
.def("defineValue", (std::string (Magick::Image::*)(const std::string&, const std::string&) const)&Magick::Image::defineValue)
.def("defineSet", (void (Magick::Image::*)(const std::string&, const std::string&, bool) )&Magick::Image::defineSet)
.def("defineSet", (bool (Magick::Image::*)(const std::string&, const std::string&) const)&Magick::Image::defineSet)
+#if MagickLibVersion < 0x700
.def("density", (void (Magick::Image::*)(const Magick::Geometry&) )&Magick::Image::density)
.def("density", (Magick::Geometry (Magick::Image::*)() const)&Magick::Image::density)
+#else
+ .def("density", (void (Magick::Image::*)(const Magick::Point&) )&Magick::Image::density)
+ .def("density", (Magick::Point (Magick::Image::*)() const)&Magick::Image::density)
+#endif
.def("depth", (void (Magick::Image::*)(const size_t) )&Magick::Image::depth)
.def("depth", (size_t (Magick::Image::*)() const)&Magick::Image::depth)
.def("directory", &Magick::Image::directory)
@@ -257,8 +349,13 @@ void Export_pyste_src_Image()
.def("fillRule", (MagickCore::FillRule (Magick::Image::*)() const)&Magick::Image::fillRule)
.def("fillPattern", (void (Magick::Image::*)(const Magick::Image&) )&Magick::Image::fillPattern)
.def("fillPattern", (Magick::Image (Magick::Image::*)() const)&Magick::Image::fillPattern)
+#if MagickLibVersion < 0x700
.def("filterType", (void (Magick::Image::*)(const MagickCore::FilterTypes) )&Magick::Image::filterType)
.def("filterType", (MagickCore::FilterTypes (Magick::Image::*)() const)&Magick::Image::filterType)
+#else
+ .def("filterType", (void (Magick::Image::*)(const MagickCore::FilterType) )&Magick::Image::filterType)
+ .def("filterType", (MagickCore::FilterType (Magick::Image::*)() const)&Magick::Image::filterType)
+#endif
.def("font", (void (Magick::Image::*)(const std::string&) )&Magick::Image::font)
.def("font", (std::string (Magick::Image::*)() const)&Magick::Image::font)
.def("fontPointsize", (void (Magick::Image::*)(const double) )&Magick::Image::fontPointsize)
@@ -267,8 +364,13 @@ void Export_pyste_src_Image()
.def("format", &Magick::Image::format)
.def("gamma", (double (Magick::Image::*)() const)&Magick::Image::gamma)
.def("geometry", &Magick::Image::geometry)
+#if MagickLibVersion < 0x700
.def("gifDisposeMethod", (void (Magick::Image::*)(const size_t) )&Magick::Image::gifDisposeMethod)
.def("gifDisposeMethod", (size_t (Magick::Image::*)() const)&Magick::Image::gifDisposeMethod)
+#else
+ .def("gifDisposeMethod", (void (Magick::Image::*)(const MagickCore::DisposeType) )&Magick::Image::gifDisposeMethod)
+ .def("gifDisposeMethod", (MagickCore::DisposeType (Magick::Image::*)() const)&Magick::Image::gifDisposeMethod)
+#endif
.def("iccColorProfile", (void (Magick::Image::*)(const Magick::Blob&) )&Magick::Image::iccColorProfile)
.def("iccColorProfile", (Magick::Blob (Magick::Image::*)() const)&Magick::Image::iccColorProfile)
.def("interlaceType", (void (Magick::Image::*)(const MagickCore::InterlaceType) )&Magick::Image::interlaceType)
@@ -278,14 +380,26 @@ void Export_pyste_src_Image()
.def("isValid", (void (Magick::Image::*)(const bool) )&Magick::Image::isValid)
.def("isValid", (bool (Magick::Image::*)() const)&Magick::Image::isValid)
.def("label", (std::string (Magick::Image::*)() const)&Magick::Image::label)
+#if MagickLibVersion < 0x700
.def("lineWidth", (void (Magick::Image::*)(const double) )&Magick::Image::lineWidth)
.def("lineWidth", (double (Magick::Image::*)() const)&Magick::Image::lineWidth)
+#endif
.def("magick", (void (Magick::Image::*)(const std::string&) )&Magick::Image::magick)
.def("magick", (std::string (Magick::Image::*)() const)&Magick::Image::magick)
+#if MagickLibVersion < 0x700
.def("matte", (void (Magick::Image::*)(const bool) )&Magick::Image::matte)
.def("matte", (bool (Magick::Image::*)() const)&Magick::Image::matte)
+#else
+ .def("alpha", (void (Magick::Image::*)(const bool) )&Magick::Image::alpha)
+ .def("alpha", (bool (Magick::Image::*)() const)&Magick::Image::alpha)
+#endif
+#if MagickLibVersion < 0x700
.def("matteColor", (void (Magick::Image::*)(const Magick::Color&) )&Magick::Image::matteColor)
.def("matteColor", (Magick::Color (Magick::Image::*)() const)&Magick::Image::matteColor)
+#else
+ .def("alphaColor", (void (Magick::Image::*)(const Magick::Color&) )&Magick::Image::alphaColor)
+ .def("alphaColor", (Magick::Color (Magick::Image::*)() const)&Magick::Image::alphaColor)
+#endif
.def("meanErrorPerPixel", &Magick::Image::meanErrorPerPixel)
.def("modulusDepth", (void (Magick::Image::*)(const size_t) )&Magick::Image::modulusDepth)
.def("modulusDepth", (size_t (Magick::Image::*)() const)&Magick::Image::modulusDepth)
@@ -296,10 +410,12 @@ void Export_pyste_src_Image()
.def("normalizedMeanError", &Magick::Image::normalizedMeanError)
.def("page", (void (Magick::Image::*)(const Magick::Geometry&) )&Magick::Image::page)
.def("page", (Magick::Geometry (Magick::Image::*)() const)&Magick::Image::page)
+#if MagickLibVersion < 0x700
.def("penColor", (void (Magick::Image::*)(const Magick::Color&) )&Magick::Image::penColor)
.def("penColor", (Magick::Color (Magick::Image::*)() const)&Magick::Image::penColor)
.def("penTexture", (void (Magick::Image::*)(const Magick::Image&) )&Magick::Image::penTexture)
.def("penTexture", (Magick::Image (Magick::Image::*)() const)&Magick::Image::penTexture)
+#endif
.def("pixelColor", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const Magick::Color&) )&Magick::Image::pixelColor)
.def("pixelColor", (Magick::Color (Magick::Image::*)(const ::ssize_t, const ::ssize_t) const)&Magick::Image::pixelColor)
.def("profile", (void (Magick::Image::*)(const std::string, const Magick::Blob&) )&Magick::Image::profile)
@@ -347,8 +463,10 @@ void Export_pyste_src_Image()
.def("subRange", (size_t (Magick::Image::*)() const)&Magick::Image::subRange)
.def("textEncoding", (void (Magick::Image::*)(const std::string&) )&Magick::Image::textEncoding)
.def("textEncoding", (std::string (Magick::Image::*)() const)&Magick::Image::textEncoding)
+#if MagickLibVersion < 0x700
.def("tileName", (void (Magick::Image::*)(const std::string&) )&Magick::Image::tileName)
.def("tileName", (std::string (Magick::Image::*)() const)&Magick::Image::tileName)
+#endif
.def("totalColors", &Magick::Image::totalColors)
.def("transformOrigin", &Magick::Image::transformOrigin)
.def("transformRotation", &Magick::Image::transformRotation)
@@ -358,8 +476,10 @@ void Export_pyste_src_Image()
.def("transformSkewY", &Magick::Image::transformSkewY)
.def("verbose", (void (Magick::Image::*)(const bool) )&Magick::Image::verbose)
.def("verbose", (bool (Magick::Image::*)() const)&Magick::Image::verbose)
+#if MagickLibVersion < 0x700
.def("view", (void (Magick::Image::*)(const std::string&) )&Magick::Image::view)
.def("view", (std::string (Magick::Image::*)() const)&Magick::Image::view)
+#endif
.def("x11Display", (void (Magick::Image::*)(const std::string&) )&Magick::Image::x11Display)
.def("x11Display", (std::string (Magick::Image::*)() const)&Magick::Image::x11Display)
.def("xResolution", &Magick::Image::xResolution)
@@ -368,7 +488,9 @@ void Export_pyste_src_Image()
.def("readPixels", &Magick::Image::readPixels)
.def("writePixels", &Magick::Image::writePixels)
.def("modifyImage", &Magick::Image::modifyImage)
+#if MagickLibVersion < 0x700
.def("throwImageException", &Magick::Image::throwImageException)
+#endif
.staticmethod("cacheThreshold")
.def( self == self )
.def( self != self )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/pythonmagick.git
More information about the Python-modules-commits
mailing list