diff --git a/src/Mod/Path/App/Area.cpp b/src/Mod/Path/App/Area.cpp index 8332036c2e..b57317bd4a 100644 --- a/src/Mod/Path/App/Area.cpp +++ b/src/Mod/Path/App/Area.cpp @@ -501,6 +501,8 @@ std::shared_ptr Area::getClearedArea(double tipDiameter, double diameter) #define AREA_MY(_param) myParams.PARAM_FNAME(_param) PARAM_ENUM_CONVERT(AREA_MY, PARAM_FNAME, PARAM_ENUM_EXCEPT, AREA_PARAMS_OFFSET_CONF); PARAM_ENUM_CONVERT(AREA_MY, PARAM_FNAME, PARAM_ENUM_EXCEPT, AREA_PARAMS_CLIPPER_FILL); + (void)SubjectFill; + (void)ClipFill; // Do not fit arcs after these offsets; it introduces unnecessary approximation error, and all off // those arcs will be converted back to segments again for clipper differencing in getRestArea anyway diff --git a/src/Mod/Path/App/AreaPy.xml b/src/Mod/Path/App/AreaPy.xml index 6b9c1c6c1e..a38a84aec1 100644 --- a/src/Mod/Path/App/AreaPy.xml +++ b/src/Mod/Path/App/AreaPy.xml @@ -62,17 +62,17 @@ same algorithm - + - + - + diff --git a/src/Mod/Path/App/AreaPyImp.cpp b/src/Mod/Path/App/AreaPyImp.cpp index 1bc1c0bc1c..817aed0e37 100644 --- a/src/Mod/Path/App/AreaPyImp.cpp +++ b/src/Mod/Path/App/AreaPyImp.cpp @@ -403,7 +403,7 @@ PyObject* AreaPy::makeSections(PyObject *args, PyObject *keywds) } PY_CATCH_OCC } -PyObject* AreaPy::getClearedArea(PyObject *args, PyObject *keywds) +PyObject* AreaPy::getClearedArea(PyObject *args) { PY_TRY { double tipDiameter, diameter; @@ -415,7 +415,7 @@ PyObject* AreaPy::getClearedArea(PyObject *args, PyObject *keywds) } PY_CATCH_OCC } -PyObject* AreaPy::getRestArea(PyObject *args, PyObject *keywds) +PyObject* AreaPy::getRestArea(PyObject *args) { PY_TRY { PyObject *pyClearedAreas; @@ -445,9 +445,11 @@ PyObject* AreaPy::getRestArea(PyObject *args, PyObject *keywds) } PY_CATCH_OCC } -PyObject* AreaPy::toTopoShape(PyObject *args, PyObject *keywds) +PyObject* AreaPy::toTopoShape(PyObject *args) { PY_TRY { + if (!PyArg_ParseTuple(args, "")) + return nullptr; return Py::new_reference_to(Part::shape2pyshape(getAreaPtr()->toTopoShape())); } PY_CATCH_OCC }