Add a pybind11 type caster for agg::rect_d

QuLogic · QuLogic · commit 73e3b08d79c1 · 2023-10-14T01:11:27.000-04:00
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -87,21 +87,17 @@ Py_points_in_path(py::array_t<double> points_obj, double r, py::object path_obj,
 }
 
 static py::tuple
-Py_update_path_extents(py::object path_obj, py::object trans_obj, py::object rect_obj,
+Py_update_path_extents(py::object path_obj, py::object trans_obj, agg::rect_d rect,
                        py::array_t<double> minpos, bool ignore)
 {
     mpl::PathIterator path;
     agg::trans_affine trans;
-    agg::rect_d rect;
     bool changed;
 
     if (!convert_path(path_obj.ptr(), &path)) {
         throw py::error_already_set();
     }
     convert_trans_affine(trans_obj, trans);
-    if (!convert_rect(rect_obj.ptr(), &rect)) {
-        throw py::error_already_set();
-    }
 
     if (minpos.ndim() != 1) {
         throw py::value_error(
@@ -255,19 +251,14 @@ Py_path_in_path(py::object a_obj, py::object atrans_obj,
 }
 
 static py::object
-Py_clip_path_to_rect(py::object path_obj, py::object rect_obj,
-                     bool inside)
+Py_clip_path_to_rect(py::object path_obj, agg::rect_d rect, bool inside)
 {
     mpl::PathIterator path;
-    agg::rect_d rect;
     std::vector<Polygon> result;
 
     if (!convert_path(path_obj.ptr(), &path)) {
         throw py::error_already_set();
     }
-    if (!convert_rect(rect_obj.ptr(), &rect)) {
-        throw py::error_already_set();
-    }
 
     clip_path_to_rect(path, rect, inside, result);
 
@@ -311,14 +302,10 @@ Py_affine_transform(py::array_t<double, py::array::c_style | py::array::forcecas
 }
 
 static int
-Py_count_bboxes_overlapping_bbox(py::object bbox_obj, py::object bboxes_obj)
+Py_count_bboxes_overlapping_bbox(agg::rect_d bbox, py::object bboxes_obj)
 {
-    agg::rect_d bbox;
     numpy::array_view<const double, 3> bboxes;
 
-    if (!convert_rect(bbox_obj.ptr(), &bbox)) {
-        throw py::error_already_set();
-    }
     if (!convert_bboxes(bboxes_obj.ptr(), &bboxes)) {
         throw py::error_already_set();
     }
@@ -386,24 +373,20 @@ Py_convert_path_to_polygons(py::object path_obj, py::object trans_obj,
     return convert_polygon_vector(result);
 }
 
-static py::tuple
+static pybind11::tuple
 Py_cleanup_path(py::object path_obj, py::object trans_obj, bool remove_nans,
-                py::object clip_rect_obj, py::object snap_mode_obj, double stroke_width,
+                agg::rect_d clip_rect, py::object snap_mode_obj, double stroke_width,
                 std::optional<bool> simplify, bool return_curves, py::object sketch_obj)
 {
     mpl::PathIterator path;
     agg::trans_affine trans;
-    agg::rect_d clip_rect;
     e_snap_mode snap_mode;
     SketchParams sketch;
 
     if (!convert_path(path_obj.ptr(), &path)) {
         throw py::error_already_set();
     }
     convert_trans_affine(trans_obj, trans);
-    if (!convert_rect(clip_rect_obj.ptr(), &clip_rect)) {
-        throw py::error_already_set();
-    }
     if (!convert_snap(snap_mode_obj.ptr(), &snap_mode)) {
         throw py::error_already_set();
     }
@@ -466,13 +449,12 @@ postfix : bool
 )""";
 
 static py::object
-Py_convert_to_string(py::object path_obj, py::object trans_obj, py::object cliprect_obj,
+Py_convert_to_string(py::object path_obj, py::object trans_obj, agg::rect_d cliprect,
                      std::optional<bool> simplify, py::object sketch_obj, int precision,
                      std::array<std::string, 5> codes_obj, bool postfix)
 {
     mpl::PathIterator path;
     agg::trans_affine trans;
-    agg::rect_d cliprect;
     SketchParams sketch;
     char *codes[5];
     std::string buffer;
@@ -482,9 +464,6 @@ Py_convert_to_string(py::object path_obj, py::object trans_obj, py::object clipr
         throw py::error_already_set();
     }
     convert_trans_affine(trans_obj, trans);
-    if (!convert_rect(cliprect_obj.ptr(), &cliprect)) {
-        throw py::error_already_set();
-    }
     if (!convert_sketch_params(sketch_obj.ptr(), &sketch)) {
         throw py::error_already_set();
     }
diff --git a/src/py_converters_11.h b/src/py_converters_11.h
@@ -8,8 +8,54 @@
 
 namespace py = pybind11;
 
+#include "agg_basics.h"
 #include "agg_trans_affine.h"
 
 void convert_trans_affine(const py::object& transform, agg::trans_affine& affine);
 
-#endif
+namespace PYBIND11_NAMESPACE { namespace detail {
+    template <> struct type_caster<agg::rect_d> {
+    public:
+        PYBIND11_TYPE_CASTER(agg::rect_d, const_name("rect_d"));
+
+        bool load(handle src, bool) {
+            if (src.is_none()) {
+                value.x1 = 0.0;
+                value.y1 = 0.0;
+                value.x2 = 0.0;
+                value.y2 = 0.0;
+                return true;
+            }
+
+            auto rect_arr = py::array_t<double>::ensure(src);
+
+            if (rect_arr.ndim() == 2) {
+                if (rect_arr.shape(0) != 2 || rect_arr.shape(1) != 2) {
+                    throw py::value_error("Invalid bounding box");
+                }
+
+                value.x1 = *rect_arr.data(0, 0);
+                value.y1 = *rect_arr.data(0, 1);
+                value.x2 = *rect_arr.data(1, 0);
+                value.y2 = *rect_arr.data(1, 1);
+
+            } else if (rect_arr.ndim() == 1) {
+                if (rect_arr.shape(0) != 4) {
+                    throw py::value_error("Invalid bounding box");
+                }
+
+                value.x1 = *rect_arr.data(0);
+                value.y1 = *rect_arr.data(1);
+                value.x2 = *rect_arr.data(2);
+                value.y2 = *rect_arr.data(3);
+
+            } else {
+                throw py::value_error("Invalid bounding box");
+            }
+
+            return true;
+        }
+    };
+}} // namespace PYBIND11_NAMESPACE::detail
+
+#endif /* MPL_PY_CONVERTERS_11_H */
