From 6de23532c8aa5d5ebdea845612cb067dd2994f1e Mon Sep 17 00:00:00 2001 From: looooo Date: Thu, 7 Sep 2017 18:41:01 +0200 Subject: [PATCH] Path: libarea: update to latest pybind11 --- src/Mod/Path/libarea/pyarea.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/Mod/Path/libarea/pyarea.cpp b/src/Mod/Path/libarea/pyarea.cpp index 1a8d78673a..02687c00b1 100644 --- a/src/Mod/Path/libarea/pyarea.cpp +++ b/src/Mod/Path/libarea/pyarea.cpp @@ -189,7 +189,7 @@ std::list spanIntersect(const Span& span1, const Span& span2) { } -void MatrixFromVector(geoff_geometry::Matrix& instance, std::vector v){ +geoff_geometry::Matrix* MatrixFromVector(std::vector v){ double array[16]; int i = 0; for (double vi: v){ @@ -197,7 +197,7 @@ void MatrixFromVector(geoff_geometry::Matrix& instance, std::vector v){ i++; if(i>=16) break; } - new (&instance) geoff_geometry::Matrix(array); + return new geoff_geometry::Matrix(array); } std::list InsideCurves(const CArea& a, const CCurve& curve) { @@ -279,7 +279,7 @@ void init_pyarea(py::module &m){ ; py::class_(m, "Curve") - .def(py::init()) + .def(py::init<>()) .def("getVertices", &getVertices) .def("append",&CCurve::append) .def("append",&append_point) @@ -318,7 +318,7 @@ void init_pyarea(py::module &m){ ; py::class_(m, "Area") - .def(py::init()) + .def(py::init<>()) .def("getCurves", &getCurves) .def("append",&CArea::append) .def("Subtract",&CArea::Subtract) @@ -341,7 +341,7 @@ void init_pyarea(py::module &m){ py::class_ > (m, "Matrix") .def(py::init()) - .def("__init__", &MatrixFromVector) + .def(py::init(&MatrixFromVector)) .def("TransformedPoint", &transformed_point) .def("Multiply", &geoff_geometry::Matrix::Multiply) ; @@ -353,8 +353,7 @@ void init_pyarea(py::module &m){ m.def("TangentialArc", TangentialArc); } -PYBIND11_PLUGIN(area){ - py::module m("area"); +PYBIND11_MODULE(area, m){ + m.doc()= "not yet"; init_pyarea(m); - return m.ptr(); -}; \ No newline at end of file +};