Merge pull request #17458 from QuLogic/image-cleanup

tacaswell · web-flow · commit d13286062177 · 2020-05-20T23:42:03.000-04:00
FIX: Cleanup C++ code and remove memory leak
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -67,8 +67,7 @@ _get_transform_mesh(PyObject *py_affine, npy_intp *dims)
     out_dims[0] = dims[0] * dims[1];
     out_dims[1] = 2;
 
-    py_inverse = PyObject_CallMethod(
-        py_affine, (char *)"inverted", (char *)"", NULL);
+    py_inverse = PyObject_CallMethod(py_affine, "inverted", NULL);
     if (py_inverse == NULL) {
         return NULL;
     }
@@ -83,10 +82,8 @@ _get_transform_mesh(PyObject *py_affine, npy_intp *dims)
         }
     }
 
-    PyObject *output_mesh =
-        PyObject_CallMethod(
-            py_inverse, (char *)"transform", (char *)"O",
-            (char *)input_mesh.pyobj(), NULL);
+    PyObject *output_mesh = PyObject_CallMethod(
+        py_inverse, "transform", "O", input_mesh.pyobj_steal());
 
     Py_DECREF(py_inverse);
 
@@ -120,7 +117,12 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
     PyArrayObject *output_array = NULL;
     PyArrayObject *transform_mesh_array = NULL;
 
+    params.interpolation = NEAREST;
     params.transform_mesh = NULL;
+    params.resample = false;
+    params.norm = false;
+    params.radius = 1.0;
+    params.alpha = 1.0;
 
     const char *kwlist[] = {
         "input_array", "output_array", "transform", "interpolation",
@@ -146,9 +148,18 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
         goto error;
     }
 
-    output_array = (PyArrayObject *)PyArray_FromAny(
-        py_output_array, NULL, 2, 3, NPY_ARRAY_C_CONTIGUOUS, NULL);
-    if (output_array == NULL) {
+    if (!PyArray_Check(py_output_array)) {
+        PyErr_SetString(PyExc_ValueError, "output array must be a NumPy array");
+        goto error;
+    }
+    output_array = (PyArrayObject *)py_output_array;
+    if (!PyArray_IS_C_CONTIGUOUS(output_array)) {
+        PyErr_SetString(PyExc_ValueError, "output array must be C-contiguous");
+        goto error;
+    }
+    if (PyArray_NDIM(output_array) < 2 || PyArray_NDIM(output_array) > 3) {
+        PyErr_SetString(PyExc_ValueError,
+                        "output array must be 2- or 3-dimensional");
         goto error;
     }
 
@@ -330,11 +341,10 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
 
     Py_DECREF(input_array);
     Py_XDECREF(transform_mesh_array);
-    return (PyObject *)output_array;
+    Py_RETURN_NONE;
 
  error:
     Py_XDECREF(input_array);
-    Py_XDECREF(output_array);
     Py_XDECREF(transform_mesh_array);
     return NULL;
 }
diff --git a/src/_ttconv.cpp b/src/_ttconv.cpp
@@ -49,7 +49,7 @@ class PythonFileWriter : public TTStreamWriter
             if (decoded == NULL) {
                 throw py::exception();
             }
-            result = PyObject_CallFunction(_write_method, (char *)"O", decoded);
+            result = PyObject_CallFunctionObjArgs(_write_method, decoded, NULL);
             Py_DECREF(decoded);
             if (!result) {
                 throw py::exception();
diff --git a/src/mplutils.cpp b/src/mplutils.cpp
@@ -10,7 +10,7 @@ int add_dict_int(PyObject *dict, const char *key, long val)
         return 1;
     }
 
-    if (PyDict_SetItemString(dict, (char *)key, valobj)) {
+    if (PyDict_SetItemString(dict, key, valobj)) {
         Py_DECREF(valobj);
         return 1;
     }
diff --git a/src/numpy_cpp.h b/src/numpy_cpp.h
@@ -406,7 +406,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
         Py_XINCREF(arr);
         m_shape = PyArray_DIMS(m_arr);
         m_strides = PyArray_STRIDES(m_arr);
-        m_data = (char *)PyArray_BYTES(m_arr);
+        m_data = PyArray_BYTES(m_arr);
     }
 
     array_view(npy_intp shape[ND]) : m_arr(NULL), m_shape(NULL), m_strides(NULL), m_data(NULL)
@@ -441,7 +441,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
         return *this;
     }
 
-    int set(PyObject *arr, bool contiguous = false)
+    bool set(PyObject *arr, bool contiguous = false)
     {
         PyArrayObject *tmp;
 
@@ -458,7 +458,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
                 tmp = (PyArrayObject *)PyArray_FromObject(arr, type_num_of<T>::value, 0, ND);
             }
             if (tmp == NULL) {
-                return 0;
+                return false;
             }
 
             if (PyArray_NDIM(tmp) == 0 || PyArray_DIM(tmp, 0) == 0) {
@@ -469,7 +469,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
                 m_strides = zeros;
                 if (PyArray_NDIM(tmp) == 0 && ND == 0) {
                     m_arr = tmp;
-                    return 1;
+                    return true;
                 }
             }
             if (PyArray_NDIM(tmp) != ND) {
@@ -478,18 +478,18 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>
                              ND,
                              PyArray_NDIM(tmp));
                 Py_DECREF(tmp);
-                return 0;
+                return false;
             }
 
             /* Copy some of the data to the view object for faster access */
             Py_XDECREF(m_arr);
             m_arr = tmp;
             m_shape = PyArray_DIMS(m_arr);
             m_strides = PyArray_STRIDES(m_arr);
-            m_data = (char *)PyArray_BYTES(tmp);
+            m_data = PyArray_BYTES(tmp);
         }
 
-        return 1;
+        return true;
     }
 
     npy_intp dim(size_t i) const
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -54,9 +54,9 @@ int convert_from_method(PyObject *obj, const char *name, converter func, void *p
 {
     PyObject *value;
 
-    value = PyObject_CallMethod(obj, (char *)name, NULL);
+    value = PyObject_CallMethod(obj, name, NULL);
     if (value == NULL) {
-        if (!PyObject_HasAttrString(obj, (char *)name)) {
+        if (!PyObject_HasAttrString(obj, name)) {
             PyErr_Clear();
             return 1;
         }
@@ -76,9 +76,9 @@ int convert_from_attr(PyObject *obj, const char *name, converter func, void *p)
 {
     PyObject *value;
 
-    value = PyObject_GetAttrString(obj, (char *)name);
+    value = PyObject_GetAttrString(obj, name);
     if (value == NULL) {
-        if (!PyObject_HasAttrString(obj, (char *)name)) {
+        if (!PyObject_HasAttrString(obj, name)) {
             PyErr_Clear();
             return 1;
         }

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ class PythonFileWriter : public TTStreamWriter`
`49`	`49`	`if (decoded == NULL) {`
`50`	`50`	`throw py::exception();`
`51`	`51`	`}`
`52`		`- result = PyObject_CallFunction(_write_method, (char *)"O", decoded);`
	`52`	`+ result = PyObject_CallFunctionObjArgs(_write_method, decoded, NULL);`
`53`	`53`	`Py_DECREF(decoded);`
`54`	`54`	`if (!result) {`
`55`	`55`	`throw py::exception();`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ int add_dict_int(PyObject dict, const char key, long val)`
`10`	`10`	`return 1;`
`11`	`11`	`}`
`12`	`12`
`13`		`- if (PyDict_SetItemString(dict, (char *)key, valobj)) {`
	`13`	`+ if (PyDict_SetItemString(dict, key, valobj)) {`
`14`	`14`	`Py_DECREF(valobj);`
`15`	`15`	`return 1;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -406,7 +406,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`406`	`406`	`Py_XINCREF(arr);`
`407`	`407`	`m_shape = PyArray_DIMS(m_arr);`
`408`	`408`	`m_strides = PyArray_STRIDES(m_arr);`
`409`		`- m_data = (char *)PyArray_BYTES(m_arr);`
	`409`	`+ m_data = PyArray_BYTES(m_arr);`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`array_view(npy_intp shape[ND]) : m_arr(NULL), m_shape(NULL), m_strides(NULL), m_data(NULL)`
`@@ -441,7 +441,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`441`	`441`	`return *this;`
`442`	`442`	`}`
`443`	`443`
`444`		`- int set(PyObject *arr, bool contiguous = false)`
	`444`	`+ bool set(PyObject *arr, bool contiguous = false)`
`445`	`445`	`{`
`446`	`446`	`PyArrayObject *tmp;`
`447`	`447`
`@@ -458,7 +458,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`458`	`458`	`tmp = (PyArrayObject *)PyArray_FromObject(arr, type_num_of<T>::value, 0, ND);`
`459`	`459`	`}`
`460`	`460`	`if (tmp == NULL) {`
`461`		`- return 0;`
	`461`	`+ return false;`
`462`	`462`	`}`
`463`	`463`
`464`	`464`	`if (PyArray_NDIM(tmp) == 0 \|\| PyArray_DIM(tmp, 0) == 0) {`
`@@ -469,7 +469,7 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`469`	`469`	`m_strides = zeros;`
`470`	`470`	`if (PyArray_NDIM(tmp) == 0 && ND == 0) {`
`471`	`471`	`m_arr = tmp;`
`472`		`- return 1;`
	`472`	`+ return true;`
`473`	`473`	`}`
`474`	`474`	`}`
`475`	`475`	`if (PyArray_NDIM(tmp) != ND) {`
`@@ -478,18 +478,18 @@ class array_view : public detail::array_view_accessors<array_view, T, ND>`
`478`	`478`	`ND,`
`479`	`479`	`PyArray_NDIM(tmp));`
`480`	`480`	`Py_DECREF(tmp);`
`481`		`- return 0;`
	`481`	`+ return false;`
`482`	`482`	`}`
`483`	`483`
`484`	`484`	`/* Copy some of the data to the view object for faster access */`
`485`	`485`	`Py_XDECREF(m_arr);`
`486`	`486`	`m_arr = tmp;`
`487`	`487`	`m_shape = PyArray_DIMS(m_arr);`
`488`	`488`	`m_strides = PyArray_STRIDES(m_arr);`
`489`		`- m_data = (char *)PyArray_BYTES(tmp);`
	`489`	`+ m_data = PyArray_BYTES(tmp);`
`490`	`490`	`}`
`491`	`491`
`492`		`- return 1;`
	`492`	`+ return true;`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`npy_intp dim(size_t i) const`
Original file line number	Diff line number	Diff line change
`@@ -54,9 +54,9 @@ int convert_from_method(PyObject obj, const char name, converter func, void *p`
`54`	`54`	`{`
`55`	`55`	`PyObject *value;`
`56`	`56`
`57`		`- value = PyObject_CallMethod(obj, (char *)name, NULL);`
	`57`	`+ value = PyObject_CallMethod(obj, name, NULL);`
`58`	`58`	`if (value == NULL) {`
`59`		`- if (!PyObject_HasAttrString(obj, (char *)name)) {`
	`59`	`+ if (!PyObject_HasAttrString(obj, name)) {`
`60`	`60`	`PyErr_Clear();`
`61`	`61`	`return 1;`
`62`	`62`	`}`
`@@ -76,9 +76,9 @@ int convert_from_attr(PyObject obj, const char name, converter func, void *p)`
`76`	`76`	`{`
`77`	`77`	`PyObject *value;`
`78`	`78`
`79`		`- value = PyObject_GetAttrString(obj, (char *)name);`
	`79`	`+ value = PyObject_GetAttrString(obj, name);`
`80`	`80`	`if (value == NULL) {`
`81`		`- if (!PyObject_HasAttrString(obj, (char *)name)) {`
	`81`	`+ if (!PyObject_HasAttrString(obj, name)) {`
`82`	`82`	`PyErr_Clear();`
`83`	`83`	`return 1;`
`84`	`84`	`}`