Catch errors in the 1d branch of Py_affine_transform

jkseppan · jkseppan · commit 16c92adf7add · 2015-09-20T18:37:46.000+03:00
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -439,11 +439,16 @@ static PyObject *Py_affine_transform(PyObject *self, PyObject *args, PyObject *k
         CALL_CPP("affine_transform", (affine_transform_2d(vertices, trans, result)));
         return result.pyobj();
     } catch (py::exception) {
-        numpy::array_view<double, 1> vertices(vertices_obj);
-        npy_intp dims[] = { vertices.dim(0) };
-        numpy::array_view<double, 1> result(dims);
-        CALL_CPP("affine_transform", (affine_transform_1d(vertices, trans, result)));
-        return result.pyobj();
+        PyErr_Clear();
+        try {
+            numpy::array_view<double, 1> vertices(vertices_obj);
+            npy_intp dims[] = { vertices.dim(0) };
+            numpy::array_view<double, 1> result(dims);
+            CALL_CPP("affine_transform", (affine_transform_1d(vertices, trans, result)));
+            return result.pyobj();
+        } catch (py::exception) {
+            return NULL;
+        }
     }
 }
 
