Move some checks from RendererAgg wrapper into itself

QuLogic · QuLogic · commit b9378957ac78 · 2024-01-16T03:27:34.000-05:00
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -29,6 +29,16 @@ RendererAgg::RendererAgg(unsigned int width, unsigned int height, double dpi)
       lastclippath(NULL),
       _fill_color(agg::rgba(1, 1, 1, 0))
 {
+    if (dpi <= 0.0) {
+        throw std::range_error("dpi must be positive");
+    }
+
+    if (width >= 1 << 16 || height >= 1 << 16) {
+        throw std::range_error(
+            "Image size of " + std::to_string(width) + "x" + std::to_string(height) +
+            " pixels is too large. It must be less than 2^16 in each direction.");
+    }
+
     unsigned stride(width * 4);
 
     pixBuffer = new agg::int8u[NUMBYTES];
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -10,6 +10,8 @@
 #include <vector>
 #include <algorithm>
 
+#include <pybind11/pybind11.h>
+
 #include "agg_alpha_mask_u8.h"
 #include "agg_conv_curve.h"
 #include "agg_conv_dash.h"
@@ -1227,6 +1229,19 @@ inline void RendererAgg::draw_gouraud_triangles(GCAgg &gc,
                                                 ColorArray &colors,
                                                 agg::trans_affine &trans)
 {
+    if (points.shape(0) && !check_trailing_shape(points, "points", 3, 2)) {
+        throw pybind11::error_already_set();
+    }
+    if (colors.shape(0) && !check_trailing_shape(colors, "colors", 3, 4)) {
+        throw pybind11::error_already_set();
+    }
+    if (points.shape(0) != colors.shape(0)) {
+        throw pybind11::value_error(
+            "points and colors arrays must be the same length, got " +
+            std::to_string(points.shape(0)) + " points and " +
+            std::to_string(colors.shape(0)) + "colors");
+    }
+
     theRasterizer.reset_clipping();
     rendererBase.reset_clipping(true);
     set_clipbox(gc.cliprect, theRasterizer);
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -145,20 +145,6 @@ static int PyRendererAgg_init(PyRendererAgg *self, PyObject *args, PyObject *kwd
         return -1;
     }
 
-    if (dpi <= 0.0) {
-        PyErr_SetString(PyExc_ValueError, "dpi must be positive");
-        return -1;
-    }
-
-    if (width >= 1 << 16 || height >= 1 << 16) {
-        PyErr_Format(
-            PyExc_ValueError,
-            "Image size of %dx%d pixels is too large. "
-            "It must be less than 2^16 in each direction.",
-            width, height);
-        return -1;
-    }
-
     CALL_CPP_INIT("RendererAgg", self->x = new RendererAgg(width, height, dpi))
 
     return 0;
@@ -420,19 +406,6 @@ PyRendererAgg_draw_gouraud_triangles(PyRendererAgg *self, PyObject *args)
                           &trans)) {
         return NULL;
     }
-    if (points.shape(0) && !check_trailing_shape(points, "points", 3, 2)) {
-        return NULL;
-    }
-    if (colors.shape(0) && !check_trailing_shape(colors, "colors", 3, 4)) {
-        return NULL;
-    }
-    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",
-                     points.shape(0), colors.shape(0));
-        return NULL;
-    }
 
     CALL_CPP("draw_gouraud_triangles", self->x->draw_gouraud_triangles(gc, points, colors, trans));
 
diff --git a/src/meson.build b/src/meson.build
@@ -77,7 +77,7 @@ extension_data = {
       '_backend_agg.cpp',
       '_backend_agg_wrapper.cpp',
     ),
-    'dependencies': [agg_dep, numpy_dep, freetype_dep],
+    'dependencies': [agg_dep, numpy_dep, freetype_dep, pybind11_dep],
   },
   '_c_internal_utils': {
     'subdir': 'matplotlib',
diff --git a/src/py_exceptions.h b/src/py_exceptions.h
@@ -46,9 +46,17 @@ class exception : public std::exception
         }                                                                    \
         return (errorcode);                                                  \
     }                                                                        \
+    catch (const std::range_error &e)                                        \
+    {                                                                        \
+        PyErr_Format(PyExc_ValueError, "In %s: %s", (name), e.what());       \
+        {                                                                    \
+            cleanup;                                                         \
+        }                                                                    \
+        return (errorcode);                                                  \
+    }                                                                        \
     catch (const std::runtime_error &e)                                      \
     {                                                                        \
-        PyErr_Format(PyExc_RuntimeError, "In %s: %s", (name), e.what());    \
+        PyErr_Format(PyExc_RuntimeError, "In %s: %s", (name), e.what());     \
         {                                                                    \
             cleanup;                                                         \
         }                                                                    \
