Use size() in place of dim(0)

mdboom · mdboom · commit d424668829f7 · 2015-10-19T09:17:54.000-04:00
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -500,21 +500,21 @@ PyRendererAgg_draw_gouraud_triangles(PyRendererAgg *self, PyObject *args, PyObje
         return NULL;
     }
 
-    if (points.dim(1) != 3 || points.dim(2) != 2) {
+    if (points.size() != 0 && (points.dim(1) != 3 || points.dim(2) != 2)) {
         PyErr_Format(PyExc_ValueError,
                      "points must be a Nx3x2 array, got %dx%dx%d",
                      points.dim(0), points.dim(1), points.dim(2));
         return NULL;
     }
 
-    if (colors.dim(1) != 3 || colors.dim(2) != 4) {
+    if (colors.size() != 0 && (colors.dim(1) != 3 || colors.dim(2) != 4)) {
         PyErr_Format(PyExc_ValueError,
                      "colors must be a Nx3x4 array, got %dx%dx%d",
                      colors.dim(0), colors.dim(1), colors.dim(2));
         return NULL;
     }
 
-    if (points.dim(0) != colors.dim(0)) {
+    if (points.size() != colors.size()) {
         PyErr_Format(PyExc_ValueError,
                      "points and colors arrays must be the same length, got %d and %d",
                      points.dim(0), colors.dim(0));
diff --git a/src/_path.h b/src/_path.h
@@ -358,7 +358,7 @@ void get_path_collection_extents(agg::trans_affine &master_transform,
                                  agg::trans_affine &offset_trans,
                                  extent_limits &extent)
 {
-    if (offsets.dim(0) != 0 && offsets.dim(1) != 2) {
+    if (offsets.size() != 0 && offsets.dim(1) != 2) {
         throw "Offsets array must be Nx2";
     }
 
@@ -416,7 +416,7 @@ void point_in_path_collection(double x,
         return;
     }
 
-    size_t Noffsets = offsets.dim(0);
+    size_t Noffsets = offsets.size();
     size_t N = std::max(Npaths, Noffsets);
     size_t Ntransforms = std::min(transforms.size(), N);
     size_t i;
@@ -692,11 +692,11 @@ clip_path_to_rect(PathIterator &path, agg::rect_d &rect, bool inside, std::vecto
 template <class VerticesArray, class ResultArray>
 void affine_transform_2d(VerticesArray &vertices, agg::trans_affine &trans, ResultArray &result)
 {
-    if (vertices.dim(0) != 0 && vertices.dim(1) != 2) {
+    if (vertices.size() != 0 && vertices.dim(1) != 2) {
         throw "Invalid vertices array.";
     }
 
-    size_t n = vertices.dim(0);
+    size_t n = vertices.size();
     double x;
     double y;
     double t0;
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -79,7 +79,7 @@ static PyObject *Py_points_in_path(PyObject *self, PyObject *args, PyObject *kwd
         return NULL;
     }
 
-    npy_intp dims[] = { points.dim(0) };
+    npy_intp dims[] = { points.size() };
     numpy::array_view<bool, 1> results(dims);
 
     CALL_CPP("points_in_path", (points_in_path(points, r, path, trans, results)));
@@ -138,7 +138,7 @@ static PyObject *Py_points_on_path(PyObject *self, PyObject *args, PyObject *kwd
         return NULL;
     }
 
-    npy_intp dims[] = { points.dim(0) };
+    npy_intp dims[] = { points.size() };
     numpy::array_view<bool, 1> results(dims);
 
     CALL_CPP("points_on_path", (points_on_path(points, r, path, trans, results)));
@@ -437,15 +437,15 @@ static PyObject *Py_affine_transform(PyObject *self, PyObject *args, PyObject *k
 
     try {
         numpy::array_view<double, 2> vertices(vertices_obj);
-        npy_intp dims[] = { vertices.dim(0), 2 };
+        npy_intp dims[] = { vertices.size(), 2 };
         numpy::array_view<double, 2> result(dims);
         CALL_CPP("affine_transform", (affine_transform_2d(vertices, trans, result)));
         return result.pyobj();
     } catch (py::exception) {
         PyErr_Clear();
         try {
             numpy::array_view<double, 1> vertices(vertices_obj);
-            npy_intp dims[] = { vertices.dim(0) };
+            npy_intp dims[] = { vertices.size() };
             numpy::array_view<double, 1> result(dims);
             CALL_CPP("affine_transform", (affine_transform_1d(vertices, trans, result)));
             return result.pyobj();
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -529,7 +529,7 @@ int convert_points(PyObject *obj, void *pointsp)
 
     points->set(obj);
 
-    if (points->dim(0) == 0) {
+    if (points->size() == 0) {
         return 1;
     }
 
@@ -553,7 +553,7 @@ int convert_transforms(PyObject *obj, void *transp)
 
     trans->set(obj);
 
-    if (trans->dim(0) == 0) {
+    if (trans->size() == 0) {
         return 1;
     }
 
@@ -577,7 +577,7 @@ int convert_bboxes(PyObject *obj, void *bboxp)
 
     bbox->set(obj);
 
-    if (bbox->dim(0) == 0) {
+    if (bbox->size() == 0) {
         return 1;
     }
 
@@ -601,7 +601,7 @@ int convert_colors(PyObject *obj, void *colorsp)
 
     colors->set(obj);
 
-    if (colors->dim(0) == 0) {
+    if (colors->size() == 0) {
         return 1;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -358,7 +358,7 @@ void get_path_collection_extents(agg::trans_affine &master_transform,`
`358`	`358`	`agg::trans_affine &offset_trans,`
`359`	`359`	`extent_limits &extent)`
`360`	`360`	`{`
`361`		`- if (offsets.dim(0) != 0 && offsets.dim(1) != 2) {`
	`361`	`+ if (offsets.size() != 0 && offsets.dim(1) != 2) {`
`362`	`362`	`throw "Offsets array must be Nx2";`
`363`	`363`	`}`
`364`	`364`
`@@ -416,7 +416,7 @@ void point_in_path_collection(double x,`
`416`	`416`	`return;`
`417`	`417`	`}`
`418`	`418`
`419`		`- size_t Noffsets = offsets.dim(0);`
	`419`	`+ size_t Noffsets = offsets.size();`
`420`	`420`	`size_t N = std::max(Npaths, Noffsets);`
`421`	`421`	`size_t Ntransforms = std::min(transforms.size(), N);`
`422`	`422`	`size_t i;`
`@@ -692,11 +692,11 @@ clip_path_to_rect(PathIterator &path, agg::rect_d &rect, bool inside, std::vecto`
`692`	`692`	`template <class VerticesArray, class ResultArray>`
`693`	`693`	`void affine_transform_2d(VerticesArray &vertices, agg::trans_affine &trans, ResultArray &result)`
`694`	`694`	`{`
`695`		`- if (vertices.dim(0) != 0 && vertices.dim(1) != 2) {`
	`695`	`+ if (vertices.size() != 0 && vertices.dim(1) != 2) {`
`696`	`696`	`throw "Invalid vertices array.";`
`697`	`697`	`}`
`698`	`698`
`699`		`- size_t n = vertices.dim(0);`
	`699`	`+ size_t n = vertices.size();`
`700`	`700`	`double x;`
`701`	`701`	`double y;`
`702`	`702`	`double t0;`
Original file line number	Diff line number	Diff line change
`@@ -529,7 +529,7 @@ int convert_points(PyObject obj, void pointsp)`
`529`	`529`
`530`	`530`	`points->set(obj);`
`531`	`531`
`532`		`- if (points->dim(0) == 0) {`
	`532`	`+ if (points->size() == 0) {`
`533`	`533`	`return 1;`
`534`	`534`	`}`
`535`	`535`
`@@ -553,7 +553,7 @@ int convert_transforms(PyObject obj, void transp)`
`553`	`553`
`554`	`554`	`trans->set(obj);`
`555`	`555`
`556`		`- if (trans->dim(0) == 0) {`
	`556`	`+ if (trans->size() == 0) {`
`557`	`557`	`return 1;`
`558`	`558`	`}`
`559`	`559`
`@@ -577,7 +577,7 @@ int convert_bboxes(PyObject obj, void bboxp)`
`577`	`577`
`578`	`578`	`bbox->set(obj);`
`579`	`579`
`580`		`- if (bbox->dim(0) == 0) {`
	`580`	`+ if (bbox->size() == 0) {`
`581`	`581`	`return 1;`
`582`	`582`	`}`
`583`	`583`
`@@ -601,7 +601,7 @@ int convert_colors(PyObject obj, void colorsp)`
`601`	`601`
`602`	`602`	`colors->set(obj);`
`603`	`603`
`604`		`- if (colors->dim(0) == 0) {`
	`604`	`+ if (colors->size() == 0) {`
`605`	`605`	`return 1;`
`606`	`606`	`}`
`607`	`607`