Inline convert_face type converter

QuLogic · QuLogic · commit 11ac056f38fb · 2024-09-11T07:39:22.000-04:00
diff --git a/src/_backend_agg_wrapper.cpp b/src/_backend_agg_wrapper.cpp
@@ -44,12 +44,13 @@ PyRendererAgg_draw_path(RendererAgg *self,
                         GCAgg &gc,
                         mpl::PathIterator path,
                         agg::trans_affine trans,
-                        pybind11::object face_obj)
+                        pybind11::object rgbFace)
 {
-    agg::rgba face;
-
-    if (!convert_face(face_obj.ptr(), gc, &face)) {
-        throw pybind11::error_already_set();
+    agg::rgba face = rgbFace.cast<agg::rgba>();
+    if (!rgbFace.is_none()) {
+        if (gc.forced_alpha || rgbFace.cast<py::sequence>().size() == 3) {
+            face.a = gc.alpha;
+        }
     }
 
     self->draw_path(gc, path, trans, face);
@@ -79,12 +80,13 @@ PyRendererAgg_draw_markers(RendererAgg *self,
                            agg::trans_affine marker_path_trans,
                            mpl::PathIterator path,
                            agg::trans_affine trans,
-                           pybind11::object face_obj)
+                           pybind11::object rgbFace)
 {
-    agg::rgba face;
-
-    if (!convert_face(face_obj.ptr(), gc, &face)) {
-        throw pybind11::error_already_set();
+    agg::rgba face = rgbFace.cast<agg::rgba>();
+    if (!rgbFace.is_none()) {
+        if (gc.forced_alpha || rgbFace.cast<py::sequence>().size() == 3) {
+            face.a = gc.alpha;
+        }
     }
 
     self->draw_markers(gc, marker_path, marker_path_trans, path, trans, face);
diff --git a/src/py_converters.cpp b/src/py_converters.cpp
@@ -489,21 +489,6 @@ int convert_gcagg(PyObject *pygc, void *gcp)
     return 1;
 }
 
-int convert_face(PyObject *color, GCAgg &gc, agg::rgba *rgba)
-{
-    if (!convert_rgba(color, rgba)) {
-        return 0;
-    }
-
-    if (color != NULL && color != Py_None) {
-        if (gc.forced_alpha || PySequence_Size(color) == 3) {
-            rgba->a = gc.alpha;
-        }
-    }
-
-    return 1;
-}
-
 int convert_points(PyObject *obj, void *pointsp)
 {
     numpy::array_view<double, 2> *points = (numpy::array_view<double, 2> *)pointsp;
diff --git a/src/py_converters.h b/src/py_converters.h
@@ -41,8 +41,6 @@ int convert_points(PyObject *pygc, void *pointsp);
 int convert_transforms(PyObject *pygc, void *transp);
 int convert_bboxes(PyObject *pygc, void *bboxp);
 int convert_colors(PyObject *pygc, void *colorsp);
-
-int convert_face(PyObject *color, GCAgg &gc, agg::rgba *rgba);
 }
 
 #endif

Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,6 @@ int convert_points(PyObject pygc, void pointsp);`
`41`	`41`	`int convert_transforms(PyObject pygc, void transp);`
`42`	`42`	`int convert_bboxes(PyObject pygc, void bboxp);`
`43`	`43`	`int convert_colors(PyObject pygc, void colorsp);`
`44`		`-`
`45`		`-int convert_face(PyObject color, GCAgg &gc, agg::rgba rgba);`
`46`	`44`	`}`
`47`	`45`
`48`	`46`	`#endif`