Merge pull request #12595 from meeseeksmachine/auto-backport-of-pr-12569-on-v3.0.x

dstansby · web-flow · commit 11bb9d55ee9f · 2018-10-25T12:11:04.000+01:00
Backport PR #12569 on branch v3.0.x (Don't confuse uintptr_t and Py_ssize_t.)
diff --git a/setupext.py b/setupext.py
@@ -1363,11 +1363,13 @@ def check(self):
 
     def get_extension(self):
         sources = [
-            'src/_tkagg.cpp'
+            'src/_tkagg.cpp',
+            'src/py_converters.cpp',
             ]
 
         ext = make_extension('matplotlib.backends._tkagg', sources)
         self.add_flags(ext)
+        Numpy().add_flags(ext)
         LibAgg().add_flags(ext, add_sources=False)
         return ext
 
diff --git a/src/_tkagg.cpp b/src/_tkagg.cpp
@@ -18,6 +18,8 @@
 // Include our own excerpts from the Tcl / Tk headers
 #include "_tkmini.h"
 
+#include "py_converters.h"
+
 #if defined(_MSC_VER)
 #  define IMG_FORMAT "%d %d %Iu"
 #else
@@ -213,9 +215,9 @@ static PyObject *mpl_tk_blit(PyObject *self, PyObject *args)
     int x1, x2, y1, y2;
     Tk_PhotoHandle photo;
     Tk_PhotoImageBlock block;
-    if (!PyArg_ParseTuple(args, "ns(iin)(iiii)(iiii):blit",
-                          &interp, &photo_name,
-                          &height, &width, &data_ptr,
+    if (!PyArg_ParseTuple(args, "O&s(iiO&)(iiii)(iiii):blit",
+                          convert_voidptr, &interp, &photo_name,
+                          &height, &width, convert_voidptr, &data_ptr,
                           &o0, &o1, &o2, &o3,
                           &x1, &x2, &y1, &y2)) {
         goto exit;
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -94,6 +94,13 @@ int convert_from_attr(PyObject *obj, const char *name, converter func, void *p)
     return 1;
 }
 
+int convert_voidptr(PyObject *obj, void *p)
+{
+    void **val = (void **)p;
+    *val = PyLong_AsVoidPtr(obj);
+    return *val != NULL ? 1 : !PyErr_Occurred();
+}
+
 int convert_double(PyObject *obj, void *p)
 {
     double *val = (double *)p;
diff --git a/src/py_converters.h b/src/py_converters.h
@@ -23,6 +23,7 @@ typedef int (*converter)(PyObject *, void *);
 int convert_from_attr(PyObject *obj, const char *name, converter func, void *p);
 int convert_from_method(PyObject *obj, const char *name, converter func, void *p);
 
+int convert_voidptr(PyObject *obj, void *p);
 int convert_double(PyObject *obj, void *p);
 int convert_bool(PyObject *obj, void *p);
 int convert_cap(PyObject *capobj, void *capp);

Original file line number	Diff line number	Diff line change
`@@ -94,6 +94,13 @@ int convert_from_attr(PyObject obj, const char name, converter func, void *p)`
`94`	`94`	`return 1;`
`95`	`95`	`}`
`96`	`96`
	`97`	`+int convert_voidptr(PyObject obj, void p)`
	`98`	`+{`
	`99`	`+ void val = (void )p;`
	`100`	`+ *val = PyLong_AsVoidPtr(obj);`
	`101`	`+ return *val != NULL ? 1 : !PyErr_Occurred();`
	`102`	`+}`
	`103`	`+`
`97`	`104`	`int convert_double(PyObject obj, void p)`
`98`	`105`	`{`
`99`	`106`	`double val = (double )p;`