Add a pybind11 type caster for agg::rgba

Author: QuLogic

src/_backend_agg_wrapper.cpp

@@ -43,19 +43,14 @@ PyRendererAgg_draw_path(RendererAgg *self,
                         pybind11::object gc_obj,
                         mpl::PathIterator path,
                         agg::trans_affine trans,
-                        pybind11::object face_obj)
+                        agg::rgba face)
 {
     GCAgg gc;
-    agg::rgba face;
 
     if (!convert_gcagg(gc_obj.ptr(), &gc)) {
         throw pybind11::error_already_set();
     }
 
-    if (!convert_face(face_obj.ptr(), gc, &face)) {
-        throw pybind11::error_already_set();
-    }
-
     self->draw_path(gc, path, trans, face);
 }
 
@@ -87,19 +82,14 @@ PyRendererAgg_draw_markers(RendererAgg *self,
                            agg::trans_affine marker_path_trans,
                            mpl::PathIterator path,
                            agg::trans_affine trans,
-                           pybind11::object face_obj)
+                           agg::rgba face)
 {
     GCAgg gc;
-    agg::rgba face;
 
     if (!convert_gcagg(gc_obj.ptr(), &gc)) {
         throw pybind11::error_already_set();
     }
 
-    if (!convert_face(face_obj.ptr(), gc, &face)) {
-        throw pybind11::error_already_set();
-    }
-
     self->draw_markers(gc, marker_path, marker_path_trans, path, trans, face);
 }
 

src/py_converters_11.h

@@ -9,6 +9,7 @@
 namespace py = pybind11;
 
 #include "agg_basics.h"
+#include "agg_color_rgba.h"
 #include "agg_trans_affine.h"
 #include "path_converters.h"
 
@@ -58,6 +59,36 @@ namespace PYBIND11_NAMESPACE { namespace detail {
         }
     };
 
+    template <> struct type_caster<agg::rgba> {
+    public:
+        PYBIND11_TYPE_CASTER(agg::rgba, const_name("rgba"));
+
+        bool load(handle src, bool) {
+            if (src.is_none()) {
+                value.r = 0.0;
+                value.g = 0.0;
+                value.b = 0.0;
+                value.a = 0.0;
+            } else {
+                auto rgbatuple = src.cast<pybind11::tuple>();
+                value.r = rgbatuple[0].cast<double>();
+                value.g = rgbatuple[1].cast<double>();
+                value.b = rgbatuple[2].cast<double>();
+                switch (rgbatuple.size()) {
+                case 4:
+                    value.a = rgbatuple[3].cast<double>();
+                    break;
+                case 3:
+                    value.a = 1.0;
+                    break;
+                default:
+                    throw pybind11::value_error("RGBA value must be 3- or 4-tuple");
+                }
+            }
+            return true;
+        }
+    };
+
     template <> struct type_caster<agg::trans_affine> {
     public:
         PYBIND11_TYPE_CASTER(agg::trans_affine, const_name("trans_affine"));