Commitad45b84

committed

Don't confuse uintptr_t and Py_ssize_t.

1 parenta43fd85 commitad45b84Copy full SHA for ad45b84

File tree

+15

-4

lines changed

+15

-4

lines changed

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1235,11 +1235,13 @@ def check(self):`
`1235`	`1235`
`1236`	`1236`	`defget_extension(self):`
`1237`	`1237`	`sources= [`
`1238`		`-'src/_tkagg.cpp'`
	`1238`	`+'src/_tkagg.cpp',`
	`1239`	`+'src/py_converters.cpp',`
`1239`	`1240`	`]`
`1240`	`1241`
`1241`	`1242`	`ext=make_extension('matplotlib.backends._tkagg',sources)`
`1242`	`1243`	`self.add_flags(ext)`
	`1244`	`+Numpy().add_flags(ext)`
`1243`	`1245`	`LibAgg().add_flags(ext,add_sources=False)`
`1244`	`1246`	`returnext`
`1245`	`1247`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`// Include our own excerpts from the Tcl / Tk headers`
`19`	`19`	`#include"_tkmini.h"`
`20`	`20`
	`21`	`+#include"py_converters.h"`
	`22`	`+`
`21`	`23`	`#if defined(_MSC_VER)`
`22`	`24`	`#defineIMG_FORMAT"%d %d %Iu"`
`23`	`25`	`#else`
`@@ -213,9 +215,9 @@ static PyObject mpl_tk_blit(PyObject self, PyObject *args)`
`213`	`215`	`int x1, x2, y1, y2;`
`214`	`216`	`Tk_PhotoHandle photo;`
`215`	`217`	`Tk_PhotoImageBlock block;`
`216`		`-if (!PyArg_ParseTuple(args,"ns(iin)(iiii)(iiii):blit",`
`217`		`- &interp, &photo_name,`
`218`		`- &height, &width, &data_ptr,`
	`218`	`+if (!PyArg_ParseTuple(args,"O&s(iiO&)(iiii)(iiii):blit",`
	`219`	`+convert_voidptr,&interp, &photo_name,`
	`220`	`+ &height, &width,convert_voidptr,&data_ptr,`
`219`	`221`	`&o0, &o1, &o2, &o3,`
`220`	`222`	`&x1, &x2, &y1, &y2)) {`
`221`	`223`	`goto exit;`

Lines changed: 6 additions & 0 deletions

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

Lines changed: 1 addition & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,7 @@ typedef int (converter)(PyObject , void *);`
`23`	`23`	`intconvert_from_attr(PyObject obj,constchar name, converter func,void *p);`
`24`	`24`	`intconvert_from_method(PyObject obj,constchar name, converter func,void *p);`
`25`	`25`
	`26`	`+intconvert_voidptr(PyObject obj,void p);`
`26`	`27`	`intconvert_double(PyObject obj,void p);`
`27`	`28`	`intconvert_bool(PyObject obj,void p);`
`28`	`29`	`intconvert_cap(PyObject capobj,void capp);`

Comments

(0)