Commitc23f1b2

committed

Add a pybind11 type caster for agg::rgba

1 parent85dacfd commitc23f1b2Copy full SHA for c23f1b2

File tree

+33

-12

lines changed

+33

-12

lines changed

Lines changed: 2 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -43,19 +43,14 @@ PyRendererAgg_draw_path(RendererAgg *self,`
`43`	`43`	`pybind11::object gc_obj,`
`44`	`44`	`mpl::PathIterator path,`
`45`	`45`	`agg::trans_affine trans,`
`46`		`-pybind11::object face_obj)`
	`46`	`+agg::rgba face)`
`47`	`47`	`{`
`48`	`48`	`GCAgg gc;`
`49`		`- agg::rgba face;`
`50`	`49`
`51`	`50`	`if (!convert_gcagg(gc_obj.ptr(), &gc)) {`
`52`	`51`	`throwpybind11::error_already_set();`
`53`	`52`	`}`
`54`	`53`
`55`		`-if (!convert_face(face_obj.ptr(), gc, &face)) {`
`56`		`-throwpybind11::error_already_set();`
`57`		`- }`
`58`		`-`
`59`	`54`	`self->draw_path(gc, path, trans, face);`
`60`	`55`	`}`
`61`	`56`
`@@ -87,19 +82,14 @@ PyRendererAgg_draw_markers(RendererAgg *self,`
`87`	`82`	`agg::trans_affine marker_path_trans,`
`88`	`83`	`mpl::PathIterator path,`
`89`	`84`	`agg::trans_affine trans,`
`90`		`-pybind11::object face_obj)`
	`85`	`+agg::rgba face)`
`91`	`86`	`{`
`92`	`87`	`GCAgg gc;`
`93`		`- agg::rgba face;`
`94`	`88`
`95`	`89`	`if (!convert_gcagg(gc_obj.ptr(), &gc)) {`
`96`	`90`	`throwpybind11::error_already_set();`
`97`	`91`	`}`
`98`	`92`
`99`		`-if (!convert_face(face_obj.ptr(), gc, &face)) {`
`100`		`-throwpybind11::error_already_set();`
`101`		`- }`
`102`		`-`
`103`	`93`	`self->draw_markers(gc, marker_path, marker_path_trans, path, trans, face);`
`104`	`94`	`}`
`105`	`95`

Lines changed: 31 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`namespacepy= pybind11;`
`10`	`10`
`11`	`11`	`#include"agg_basics.h"`
	`12`	`+#include"agg_color_rgba.h"`
`12`	`13`	`#include"agg_trans_affine.h"`
`13`	`14`	`#include"path_converters.h"`
`14`	`15`
`@@ -58,6 +59,36 @@ namespace PYBIND11_NAMESPACE { namespace detail {`
`58`	`59`	`}`
`59`	`60`	`};`
`60`	`61`
	`62`	`+template<>structtype_caster<agg::rgba> {`
	`63`	`+public:`
	`64`	`+PYBIND11_TYPE_CASTER(agg::rgba, const_name("rgba"));`
	`65`	`+`
	`66`	`+boolload(handle src,bool) {`
	`67`	`+if (src.is_none()) {`
	`68`	`+ value.r =0.0;`
	`69`	`+ value.g =0.0;`
	`70`	`+ value.b =0.0;`
	`71`	`+ value.a =0.0;`
	`72`	`+ }else {`
	`73`	`+auto rgbatuple = src.cast<pybind11::tuple>();`
	`74`	`+ value.r = rgbatuple[0].cast<double>();`
	`75`	`+ value.g = rgbatuple[1].cast<double>();`
	`76`	`+ value.b = rgbatuple[2].cast<double>();`
	`77`	`+switch (rgbatuple.size()) {`
	`78`	`+case4:`
	`79`	`+ value.a = rgbatuple[3].cast<double>();`
	`80`	`+break;`
	`81`	`+case3:`
	`82`	`+ value.a =1.0;`
	`83`	`+break;`
	`84`	`+default:`
	`85`	`+throwpybind11::value_error("RGBA value must be 3- or 4-tuple");`
	`86`	`+ }`
	`87`	`+ }`
	`88`	`+returntrue;`
	`89`	`+ }`
	`90`	`+ };`
	`91`	`+`
`61`	`92`	`template<>structtype_caster<agg::trans_affine> {`
`62`	`93`	`public:`
`63`	`94`	`PYBIND11_TYPE_CASTER(agg::trans_affine, const_name("trans_affine"));`

Comments

(0)