Add a pybind11 type caster for SketchParams

QuLogic · QuLogic · commit 25fbfe7e3f9e · 2024-01-06T06:28:19.000-05:00
diff --git a/src/_path_wrapper.cpp b/src/_path_wrapper.cpp
@@ -11,6 +11,7 @@
 
 #include "_path.h"
 
+#include "_backend_agg_basic_types.h"
 #include "py_adaptors.h"
 #include "py_converters.h"
 #include "py_converters_11.h"
@@ -302,14 +303,8 @@ Py_convert_path_to_polygons(mpl::PathIterator path, agg::trans_affine trans,
 static py::tuple
 Py_cleanup_path(mpl::PathIterator path, agg::trans_affine trans, bool remove_nans,
                 agg::rect_d clip_rect, e_snap_mode snap_mode, double stroke_width,
-                std::optional<bool> simplify, bool return_curves, py::object sketch_obj)
+                std::optional<bool> simplify, bool return_curves, SketchParams sketch)
 {
-    SketchParams sketch;
-
-    if (!convert_sketch_params(sketch_obj.ptr(), &sketch)) {
-        throw py::error_already_set();
-    }
-
     if (!simplify.has_value()) {
         simplify = path.should_simplify();
     }
@@ -367,18 +362,13 @@ postfix : bool
 static py::object
 Py_convert_to_string(mpl::PathIterator path, agg::trans_affine trans,
                      agg::rect_d cliprect, std::optional<bool> simplify,
-                     py::object sketch_obj, int precision,
+                     SketchParams sketch, int precision,
                      std::array<std::string, 5> codes_obj, bool postfix)
 {
-    SketchParams sketch;
     char *codes[5];
     std::string buffer;
     bool status;
 
-    if (!convert_sketch_params(sketch_obj.ptr(), &sketch)) {
-        throw py::error_already_set();
-    }
-
     for(auto i = 0; i < 5; ++i) {
         codes[i] = const_cast<char *>(codes_obj[i].c_str());
     }
diff --git a/src/py_converters_11.h b/src/py_converters_11.h
@@ -127,6 +127,26 @@ namespace PYBIND11_NAMESPACE { namespace detail {
         }
     };
 #endif
+
+/* Remove all this macro magic after dropping NumPy usage and just include `_backend_agg_basic_types.h`. */
+#ifdef MPL_BACKEND_AGG_BASIC_TYPES_H
+    template <> struct type_caster<SketchParams> {
+    public:
+        PYBIND11_TYPE_CASTER(SketchParams, const_name("SketchParams"));
+
+        bool load(handle src, bool) {
+            if (src.is_none()) {
+                value.scale = 0.0;
+                return true;
+            }
+
+            auto params = src.cast<std::tuple<double, double, double>>();
+	    std::tie(value.scale, value.length, value.randomness) = params;
+
+            return true;
+        }
+    };
+#endif
 }} // namespace PYBIND11_NAMESPACE::detail
 
 #endif /* MPL_PY_CONVERTERS_11_H */
