From b081bb05f7c4e5beeaa1b8a9b78093f82cc59624 Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 6 Sep 2023 11:52:14 +0200 Subject: [PATCH] Part: when replacing PyArg_ParseTupleAndKeywords with Base::Wrapped_ParseTupleAndKeywords then in a few cases the negation of the expression has been removed. See also: https://forum.freecad.org/viewtopic.php?t=80958 --- .../Part/App/Geom2d/BSplineCurve2dPyImp.cpp | 20 +++++++++---------- src/Mod/Part/App/GeometryCurvePyImp.cpp | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp b/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp index 1f473eef0e..5d6b574b62 100644 --- a/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp +++ b/src/Mod/Part/App/Geom2d/BSplineCurve2dPyImp.cpp @@ -742,11 +742,11 @@ PyObject* BSplineCurve2dPy::approximate(PyObject *args, PyObject *kwds) "ParamType", "Parameters", "LengthWeight", "CurvatureWeight", "TorsionWeight", nullptr}; - if (Base::Wrapped_ParseTupleAndKeywords(args, kwds, "O|isdisOddd",kwds_interp, - &obj, °Max, - &continuity, &tol3d, °Min, - &parType, &par, - &weight1, &weight2, &weight3)) { + if (!Base::Wrapped_ParseTupleAndKeywords(args, kwds, "O|isdisOddd",kwds_interp, + &obj, °Max, + &continuity, &tol3d, °Min, + &parType, &par, + &weight1, &weight2, &weight3)) { return nullptr; } @@ -920,11 +920,11 @@ PyObject* BSplineCurve2dPy::interpolate(PyObject *args, PyObject *kwds) "FinalTangent", "Tangents", "TangentFlags", "Parameters", nullptr}; - if (Base::Wrapped_ParseTupleAndKeywords(args, kwds, "O|O!dO!O!OOO",kwds_interp, - &obj, &PyBool_Type, &periodic, &tol3d, - Base::Vector2dPy::type_object(), &t1, - Base::Vector2dPy::type_object(), &t2, - &ts, &fl, &par)) { + if (!Base::Wrapped_ParseTupleAndKeywords(args, kwds, "O|O!dO!O!OOO",kwds_interp, + &obj, &PyBool_Type, &periodic, &tol3d, + Base::Vector2dPy::type_object(), &t1, + Base::Vector2dPy::type_object(), &t2, + &ts, &fl, &par)) { return nullptr; } diff --git a/src/Mod/Part/App/GeometryCurvePyImp.cpp b/src/Mod/Part/App/GeometryCurvePyImp.cpp index edfb593d48..ba3f1e8696 100644 --- a/src/Mod/Part/App/GeometryCurvePyImp.cpp +++ b/src/Mod/Part/App/GeometryCurvePyImp.cpp @@ -562,8 +562,8 @@ PyObject* GeometryCurvePy::projectPoint(PyObject *args, PyObject* kwds) PyObject *v; const char *meth = "NearestPoint"; static const std::array kwlist{"Point", "Method", nullptr}; - if (Base::Wrapped_ParseTupleAndKeywords(args, kwds, "O!|s", kwlist, - &Base::VectorPy::Type, &v, &meth)) { + if (!Base::Wrapped_ParseTupleAndKeywords(args, kwds, "O!|s", kwlist, + &Base::VectorPy::Type, &v, &meth)) { return nullptr; }