Merge pull request matplotlib#19918 from QuLogic/contour-cleanup

Cleanup some consistency in contour extensions

Author: tacaswell

src/_contour.cpp

@@ -11,11 +11,6 @@
 #include <algorithm>
 
 
-// 'kind' codes.
-#define MOVETO 1
-#define LINETO 2
-#define CLOSEPOLY 79
-
 // Point indices from current quad index.
 #define POINT_SW (quad)
 #define POINT_SE (quad+1)

src/_path.h

@@ -1138,15 +1138,14 @@ bool __convert_to_string(PathIterator &path,
     double last_x = 0.0;
     double last_y = 0.0;
 
-    const int sizes[] = { 1, 1, 2, 3 };
     int size = 0;
     unsigned code;
 
     while ((code = path.vertex(&x[0], &y[0])) != agg::path_cmd_stop) {
-        if (code == 0x4f) {
+        if (code == CLOSEPOLY) {
             buffer += codes[4];
         } else if (code < 5) {
-            size = sizes[code - 1];
+            size = NUM_VERTICES[code];
 
             for (int i = 1; i < size; ++i) {
                 unsigned subcode = path.vertex(&x[i], &y[i]);

src/ft2font.cpp

@@ -209,10 +209,10 @@ ft_outline_move_to(FT_Vector const* to, void* user)
     ft_outline_decomposer* d = reinterpret_cast<ft_outline_decomposer*>(user);
     if (d->codes) {
         if (d->index) {
-            // Appending ENDPOLY is important to make patheffects work.
+            // Appending CLOSEPOLY is important to make patheffects work.
             *(d->vertices++) = 0;
             *(d->vertices++) = 0;
-            *(d->codes++) = ENDPOLY;
+            *(d->codes++) = CLOSEPOLY;
         }
         *(d->vertices++) = to->x / 64.;
         *(d->vertices++) = to->y / 64.;
@@ -292,7 +292,7 @@ FT2Font::get_path()
                      "FT_Outline_Decompose failed with error 0x%x", error);
         return NULL;
     }
-    if (!decomposer.index) {  // Don't append ENDPOLY to null glyphs.
+    if (!decomposer.index) {  // Don't append CLOSEPOLY to null glyphs.
       npy_intp vertices_dims[2] = { 0, 2 };
       numpy::array_view<double, 2> vertices(vertices_dims);
       npy_intp codes_dims[1] = { 0 };
@@ -315,7 +315,7 @@ FT2Font::get_path()
     }
     *(decomposer.vertices++) = 0;
     *(decomposer.vertices++) = 0;
-    *(decomposer.codes++) = ENDPOLY;
+    *(decomposer.codes++) = CLOSEPOLY;
     return Py_BuildValue("NN", vertices.pyobj(), codes.pyobj());
 }
 

src/mplutils.h

@@ -40,13 +40,14 @@ inline double mpl_round(double v)
     return (double)(int)(v + ((v >= 0.0) ? 0.5 : -0.5));
 }
 
+// 'kind' codes for paths.
 enum {
     STOP = 0,
     MOVETO = 1,
     LINETO = 2,
     CURVE3 = 3,
     CURVE4 = 4,
-    ENDPOLY = 0x4f
+    CLOSEPOLY = 0x4f
 };
 
 const size_t NUM_VERTICES[] = { 1, 1, 1, 2, 3, 1 };

src/tri/_tri.cpp

@@ -7,15 +7,12 @@
  */
 #define NO_IMPORT_ARRAY
 
+#include "../mplutils.h"
 #include "_tri.h"
 
 #include <algorithm>
 #include <set>
 
-#define MOVETO 1
-#define LINETO 2
-#define CLOSEPOLY 79
-
 
 TriEdge::TriEdge()
     : tri(-1), edge(-1)
@@ -629,14 +626,12 @@ PyObject* TriContourGenerator::contour_line_to_segs_and_kinds(const Contour& con
         npy_intp npoints = static_cast<npy_intp>(contour_line.size());
 
         npy_intp segs_dims[2] = {npoints, 2};
-        PyArrayObject* segs = (PyArrayObject*)PyArray_SimpleNew(
-                                                     2, segs_dims, NPY_DOUBLE);
-        double* segs_ptr = (double*)PyArray_DATA(segs);
+        numpy::array_view<double, 2> segs(segs_dims);
+        double* segs_ptr = segs.data();
 
         npy_intp codes_dims[1] = {npoints};
-        PyArrayObject* codes = (PyArrayObject*)PyArray_SimpleNew(
-                                                1, codes_dims, NPY_UBYTE);
-        unsigned char* codes_ptr = (unsigned char*)PyArray_DATA(codes);
+        numpy::array_view<unsigned char, 1> codes(codes_dims);
+        unsigned char* codes_ptr = codes.data();
 
         for (ContourLine::const_iterator it = contour_line.begin();
              it != contour_line.end(); ++it) {
@@ -650,24 +645,21 @@ PyObject* TriContourGenerator::contour_line_to_segs_and_kinds(const Contour& con
             contour_line.front() == contour_line.back())
             *(codes_ptr-1) = CLOSEPOLY;
 
-        if (PyList_SetItem(vertices_list, i, (PyObject*)segs) ||
-            PyList_SetItem(codes_list, i, (PyObject*)codes)) {
-            Py_XDECREF(segs);
-            Py_XDECREF(codes);
-            PyErr_SetString(PyExc_RuntimeError,
-                            "Unable to set contour segments and kind codes");
-            return NULL;
-        }
+        PyList_SET_ITEM(vertices_list, i, segs.pyobj());
+        PyList_SET_ITEM(codes_list, i, codes.pyobj());
     }
 
     PyObject* result = PyTuple_New(2);
-    if (PyTuple_SetItem(result, 0, (PyObject*)vertices_list) ||
-        PyTuple_SetItem(result, 1, (PyObject*)codes_list)) {
-        Py_XDECREF(result);
-        PyErr_SetString(PyExc_RuntimeError,
-                        "Unable to set contour segments and kind codes");
-        return NULL;
+    if (result == 0) {
+        Py_XDECREF(vertices_list);
+        Py_XDECREF(codes_list);
+        throw std::runtime_error("Failed to create Python tuple");
     }
+
+    // No error checking here as filling in a brand new pre-allocated result.
+    PyTuple_SET_ITEM(result, 0, vertices_list);
+    PyTuple_SET_ITEM(result, 1, codes_list);
+
     return result;
 }
 
@@ -697,15 +689,13 @@ PyObject* TriContourGenerator::contour_to_segs_and_kinds(const Contour& contour)
 
     // Create segs array for point coordinates.
     npy_intp segs_dims[2] = {n_points, 2};
-    PyArrayObject* segs = (PyArrayObject*)PyArray_SimpleNew(
-                                                2, segs_dims, NPY_DOUBLE);
-    double* segs_ptr = (double*)PyArray_DATA(segs);
+    numpy::array_view<double, 2> segs(segs_dims);
+    double* segs_ptr = segs.data();
 
     // Create kinds array for code types.
     npy_intp codes_dims[1] = {n_points};
-    PyArrayObject* codes = (PyArrayObject*)PyArray_SimpleNew(
-                                                1, codes_dims, NPY_UBYTE);
-    unsigned char* codes_ptr = (unsigned char*)PyArray_DATA(codes);
+    numpy::array_view<unsigned char, 1> codes(codes_dims);
+    unsigned char* codes_ptr = codes.data();
 
     for (line = contour.begin(); line != contour.end(); ++line) {
         for (point = line->begin(); point != line->end(); point++) {
@@ -725,21 +715,24 @@ PyObject* TriContourGenerator::contour_to_segs_and_kinds(const Contour& contour)
         throw std::runtime_error("Failed to create Python list");
     }
 
-    if (PyList_Append(vertices_list, (PyObject*)segs) ||
-        PyList_Append(codes_list, (PyObject*)codes)) {
+    if (PyList_Append(vertices_list, segs.pyobj_steal()) ||
+        PyList_Append(codes_list, codes.pyobj_steal())) {
         Py_XDECREF(vertices_list);
         Py_XDECREF(codes_list);
         throw std::runtime_error("Unable to add contour to vertices and codes lists");
     }
 
     PyObject* result = PyTuple_New(2);
-    if (PyTuple_SetItem(result, 0, (PyObject*)vertices_list) ||
-        PyTuple_SetItem(result, 1, (PyObject*)codes_list)) {
-        Py_XDECREF(result);
-        PyErr_SetString(PyExc_RuntimeError,
-                        "Unable to set contour segments and kinds");
-        return NULL;
+    if (result == 0) {
+        Py_XDECREF(vertices_list);
+        Py_XDECREF(codes_list);
+        throw std::runtime_error("Failed to create Python tuple");
     }
+
+    // No error checking here as filling in a brand new pre-allocated tuple.
+    PyTuple_SET_ITEM(result, 0, vertices_list);
+    PyTuple_SET_ITEM(result, 1, codes_list);
+
     return result;
 }