[Python-modules-commits] [python-pgmagick] 01/07: Import python-pgmagick_0.5.12.orig.tar.gz

[Sebastian Ramacher]

This is an automated email from the git hooks/post-receive script.

sramacher pushed a commit to tag debian/0.5.12-1
in repository python-pgmagick.

commit 1c248d7e9544c447f8c0e8be3c7f4f15d260cb10
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Nov 8 14:55:52 2015 +0100

    Import python-pgmagick_0.5.12.orig.tar.gz
---
 PKG-INFO                   |  2 +-
 pgmagick.egg-info/PKG-INFO |  2 +-
 pgmagick/_version.py       |  2 +-
 setup.py                   | 13 +++++++++++--
 src/_Image.cpp             |  8 ++++++--
 5 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/PKG-INFO b/PKG-INFO
index 7a034de..1dc16e5 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pgmagick
-Version: 0.5.11
+Version: 0.5.12
 Summary: Yet Another Python wrapper for GraphicsMagick
 Home-page: http://bitbucket.org/hhatto/pgmagick
 Author: Hideo Hattori
diff --git a/pgmagick.egg-info/PKG-INFO b/pgmagick.egg-info/PKG-INFO
index 7a034de..1dc16e5 100644
--- a/pgmagick.egg-info/PKG-INFO
+++ b/pgmagick.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: pgmagick
-Version: 0.5.11
+Version: 0.5.12
 Summary: Yet Another Python wrapper for GraphicsMagick
 Home-page: http://bitbucket.org/hhatto/pgmagick
 Author: Hideo Hattori
diff --git a/pgmagick/_version.py b/pgmagick/_version.py
index d95a76c..dd9570a 100644
--- a/pgmagick/_version.py
+++ b/pgmagick/_version.py
@@ -1 +1 @@
-__version__ = '0.5.11'
+__version__ = '0.5.12'
diff --git a/setup.py b/setup.py
index a2ed2c4..1ccac98 100644
--- a/setup.py
+++ b/setup.py
@@ -18,7 +18,10 @@ search_library_dirs = ['/usr/local/lib64/', '/usr/lib64/',
 search_pkgconfig_dirs = ['/usr/local/lib/pkgconfig/', '/usr/local/lib64/pkgconfig/',
                          '/usr/lib/pkgconfig/', '/usr/lib64/pkgconfig']
 if sys.platform.lower() == 'darwin':
-    include_dirs.append('/opt/local/include/')
+    if os.path.exists('/opt/local/include'):
+        include_dirs.append('/opt/local/include/')
+    else:
+        include_dirs.append('/usr/local/include/')
     search_include_dirs.extend(['/opt/local/include/GraphicsMagick/',
                                 '/opt/local/include/',
                                 '/usr/local/Cellar/graphicsmagick'])
@@ -132,7 +135,13 @@ if _version:
         # ex) 1.2 -> 1.2.0
         _version.append(0)
     if LIBRARY == 'GraphicsMagick':
-        if _version[0] == 1 and _version[1] == 3 and _version[2] >= 20:
+        if _version[0] == 1 and _version[1] == 3 and _version[2] >= 22:
+            ext_compile_args = ["-DPGMAGICK_LIB_GRAPHICSMAGICK_1_3_6",
+                                "-DPGMAGICK_LIB_GRAPHICSMAGICK_1_3_x",
+                                "-DPGMAGICK_LIB_GRAPHICSMAGICK_1_3_19",
+                                "-DPGMAGICK_LIB_GRAPHICSMAGICK_1_3_20",
+                                "-DPGMAGICK_LIB_GRAPHICSMAGICK_1_3_22"]
+        elif _version[0] == 1 and _version[1] == 3 and _version[2] >= 20:
             ext_compile_args = ["-DPGMAGICK_LIB_GRAPHICSMAGICK_1_3_6",
                                 "-DPGMAGICK_LIB_GRAPHICSMAGICK_1_3_x",
                                 "-DPGMAGICK_LIB_GRAPHICSMAGICK_1_3_19",
diff --git a/src/_Image.cpp b/src/_Image.cpp
index 515f5d8..e354e89 100644
--- a/src/_Image.cpp
+++ b/src/_Image.cpp
@@ -62,7 +62,11 @@ void __Image()
 #ifdef PGMAGICK_LIB_IMAGEMAGICK
         .def("adaptiveBlur", &Magick::Image::adaptiveBlur, Magick_Image_adaptiveBlur_overloads_0_2())
 #endif
+#ifdef PGMAGICK_LIB_GRAPHICSMAGICK_1_3_22
+        .def("adaptiveThreshold", (void (Magick::Image::*)(const unsigned int, const unsigned int, const double) )&Magick::Image::adaptiveThreshold)
+#else
         .def("adaptiveThreshold", &Magick::Image::adaptiveThreshold, Magick_Image_adaptiveThreshold_overloads_2_3())
+#endif
         .def("addNoise", &Magick::Image::addNoise)
 #ifdef PGMAGICK_LIB_GRAPHICSMAGICK_1_3_x
         .def("addNoiseChannel", &Magick::Image::addNoiseChannel)
@@ -181,8 +185,8 @@ void __Image()
         .def("quantumOperator", (void (Magick::Image::*)(const Magick::ChannelType, const Magick::MagickEvaluateOperator, double))&Magick::Image::quantumOperator)
         .def("quantumOperator", (void (Magick::Image::*)(const ::ssize_t, const ::ssize_t, const size_t, const size_t, const Magick::ChannelType, const Magick::MagickEvaluateOperator, const double))&Magick::Image::quantumOperator)
 #else
-        .def("quantumOperator", (void (Magick::Image::*)(const Magick::ChannelType, const Magick::QuantumOperator, Magick::Quantum))&Magick::Image::quantumOperator)
-        .def("quantumOperator", (void (Magick::Image::*)(const int, const int, const unsigned int, const unsigned int, const Magick::ChannelType, const Magick::QuantumOperator, Magick::Quantum))&Magick::Image::quantumOperator)
+        .def("quantumOperator", (void (Magick::Image::*)(const Magick::ChannelType, const Magick::QuantumOperator, const double))&Magick::Image::quantumOperator)
+        .def("quantumOperator", (void (Magick::Image::*)(const int, const int, const unsigned int, const unsigned int, const Magick::ChannelType, const Magick::QuantumOperator, const double))&Magick::Image::quantumOperator)
 #endif
         .def("process", &Magick::Image::process)
         .def("raiseEdge", &Magick::Image::raise, Magick_Image_raise_overloads_0_2())

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pgmagick.git