Replace some calls to array_view.size with .shape(0)

QuLogic · QuLogic · commit 02fa8fced30c · 2023-10-14T01:11:09.000-04:00
The other dimensions have already been confirmed to be non-zero, so
size() == shape(0) in these cases.
diff --git a/lib/matplotlib/tests/test_transforms.py b/lib/matplotlib/tests/test_transforms.py
@@ -627,9 +627,9 @@ def test_invalid_arguments():
         t.transform([])
     with pytest.raises(RuntimeError):
         t.transform([1])
-    with pytest.raises(RuntimeError):
+    with pytest.raises(ValueError):
         t.transform([[1]])
-    with pytest.raises(RuntimeError):
+    with pytest.raises(ValueError):
         t.transform([[1, 2, 3]])
 
 
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -456,13 +456,13 @@ PyRendererAgg_draw_gouraud_triangles(PyRendererAgg *self, PyObject *args)
                           &trans)) {
         return NULL;
     }
-    if (points.size() && !check_trailing_shape(points, "points", 3, 2)) {
+    if (points.shape(0) && !check_trailing_shape(points, "points", 3, 2)) {
         return NULL;
     }
-    if (colors.size() && !check_trailing_shape(colors, "colors", 3, 4)) {
+    if (colors.shape(0) && !check_trailing_shape(colors, "colors", 3, 4)) {
         return NULL;
     }
-    if (points.size() != colors.size()) {
+    if (points.shape(0) != colors.shape(0)) {
         PyErr_Format(PyExc_ValueError,
                      "points and colors arrays must be the same length, got "
                      "%" NPY_INTP_FMT " points and %" NPY_INTP_FMT "colors",
diff --git a/src/_path.h b/src/_path.h
@@ -713,7 +713,7 @@ void affine_transform_2d(VerticesArray &vertices, agg::trans_affine &trans, Resu
         throw std::runtime_error("Invalid vertices array.");
     }
 
-    size_t n = vertices.size();
+    size_t n = vertices.shape(0);
     double x;
     double y;
     double t0;
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -83,7 +83,11 @@ static PyObject *Py_points_in_path(PyObject *self, PyObject *args)
         return NULL;
     }
 
-    npy_intp dims[] = { (npy_intp)points.size() };
+    if (!check_trailing_shape(points, "points", 2)) {
+        return NULL;
+    }
+
+    npy_intp dims[] = { (npy_intp)points.shape(0) };
     numpy::array_view<uint8_t, 1> results(dims);
 
     CALL_CPP("points_in_path", (points_in_path(points, r, path, trans, results)));
@@ -361,15 +365,19 @@ static PyObject *Py_affine_transform(PyObject *self, PyObject *args)
         numpy::array_view<double, 2> vertices(vertices_arr);
         Py_DECREF(vertices_arr);
 
-        npy_intp dims[] = { (npy_intp)vertices.size(), 2 };
+        if(!check_trailing_shape(vertices, "vertices", 2)) {
+            return NULL;
+        }
+
+        npy_intp dims[] = { (npy_intp)vertices.shape(0), 2 };
         numpy::array_view<double, 2> result(dims);
         CALL_CPP("affine_transform", (affine_transform_2d(vertices, trans, result)));
         return result.pyobj();
     } else { // PyArray_NDIM(vertices_arr) == 1
         numpy::array_view<double, 1> vertices(vertices_arr);
         Py_DECREF(vertices_arr);
 
-        npy_intp dims[] = { (npy_intp)vertices.size() };
+        npy_intp dims[] = { (npy_intp)vertices.shape(0) };
         numpy::array_view<double, 1> result(dims);
         CALL_CPP("affine_transform", (affine_transform_1d(vertices, trans, result)));
         return result.pyobj();

Original file line number	Diff line number	Diff line change
`@@ -456,13 +456,13 @@ PyRendererAgg_draw_gouraud_triangles(PyRendererAgg self, PyObject args)`
`456`	`456`	`&trans)) {`
`457`	`457`	`return NULL;`
`458`	`458`	`}`
`459`		`- if (points.size() && !check_trailing_shape(points, "points", 3, 2)) {`
	`459`	`+ if (points.shape(0) && !check_trailing_shape(points, "points", 3, 2)) {`
`460`	`460`	`return NULL;`
`461`	`461`	`}`
`462`		`- if (colors.size() && !check_trailing_shape(colors, "colors", 3, 4)) {`
	`462`	`+ if (colors.shape(0) && !check_trailing_shape(colors, "colors", 3, 4)) {`
`463`	`463`	`return NULL;`
`464`	`464`	`}`
`465`		`- if (points.size() != colors.size()) {`
	`465`	`+ if (points.shape(0) != colors.shape(0)) {`
`466`	`466`	`PyErr_Format(PyExc_ValueError,`
`467`	`467`	`"points and colors arrays must be the same length, got "`
`468`	`468`	`"%" NPY_INTP_FMT " points and %" NPY_INTP_FMT "colors",`
Original file line number	Diff line number	Diff line change
`@@ -713,7 +713,7 @@ void affine_transform_2d(VerticesArray &vertices, agg::trans_affine &trans, Resu`
`713`	`713`	`throw std::runtime_error("Invalid vertices array.");`
`714`	`714`	`}`
`715`	`715`
`716`		`- size_t n = vertices.size();`
	`716`	`+ size_t n = vertices.shape(0);`
`717`	`717`	`double x;`
`718`	`718`	`double y;`
`719`	`719`	`double t0;`