Inline convert_face type converter

Author: QuLogic

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);

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;

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