Skip to content

Commit

Permalink
+ fix strict-aliasing warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
@wwmayer
wwmayer committed Aug 29, 2015
1 parent 023de9b commit 1a12d10
Show file tree
Hide file tree
Showing 9 changed files with 34 additions and 241 deletions.
10 changes: 2 additions & 8 deletions src/App/DocumentObjectGroupPyImp.cpp
View file
Expand Up @@ -185,14 +185,8 @@ PyObject* DocumentObjectGroupPy::hasObject(PyObject *args)
return NULL;
}

if (getDocumentObjectGroupPtr()->hasObject(docObj->getDocumentObjectPtr())) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
bool v = getDocumentObjectGroupPtr()->hasObject(docObj->getDocumentObjectPtr());
return PyBool_FromLong(v ? 1 : 0);
}

PyObject *DocumentObjectGroupPy::getCustomAttributes(const char* /*attr*/) const
Expand Down
12 changes: 3 additions & 9 deletions src/App/PropertyStandard.cpp
View file
Expand Up @@ -1788,11 +1788,7 @@ bool PropertyBool::getValue(void) const

PyObject *PropertyBool::getPyObject(void)
{
if (_lValue)
{Py_INCREF(Py_True); return Py_True;}
else
{Py_INCREF(Py_False); return Py_False;}

return PyBool_FromLong(_lValue ? 1 : 0);
}

void PropertyBool::setPyObject(PyObject *value)
Expand Down Expand Up @@ -1904,12 +1900,10 @@ PyObject *PropertyBoolList::getPyObject(void)
for(int i = 0;i<getSize(); i++) {
bool v = _lValueList[i];
if (v) {
Py_INCREF(Py_True);
PyTuple_SetItem(tuple, i, Py_True);
PyTuple_SetItem(tuple, i, PyBool_FromLong(1));
}
else {
Py_INCREF(Py_False);
PyTuple_SetItem(tuple, i, Py_False);
PyTuple_SetItem(tuple, i, PyBool_FromLong(0));
}
}
return tuple;
Expand Down
10 changes: 2 additions & 8 deletions src/Base/BaseClassPyImp.cpp
View file
Expand Up @@ -45,14 +45,8 @@ PyObject* BaseClassPy::isDerivedFrom(PyObject *args)
return NULL; // NULL triggers exception

Base::Type type = Base::Type::fromName(name);
if (type != Base::Type::badType() && getBaseClassPtr()->getTypeId().isDerivedFrom(type)) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
bool v = (type != Base::Type::badType() && getBaseClassPtr()->getTypeId().isDerivedFrom(type));
return PyBool_FromLong(v ? 1 : 0);
}

PyObject* BaseClassPy::getAllDerivedFrom(PyObject *args)
Expand Down
45 changes: 5 additions & 40 deletions src/Mod/Part/App/BSplineCurvePyImp.cpp
View file
Expand Up @@ -78,14 +78,7 @@ PyObject* BSplineCurvePy::isRational(PyObject *args)
Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = curve->IsRational();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BSplineCurvePy::isPeriodic(PyObject *args)
Expand All @@ -95,14 +88,7 @@ PyObject* BSplineCurvePy::isPeriodic(PyObject *args)
Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = curve->IsPeriodic();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BSplineCurvePy::isClosed(PyObject *args)
Expand All @@ -112,14 +98,7 @@ PyObject* BSplineCurvePy::isClosed(PyObject *args)
Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = curve->IsClosed();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BSplineCurvePy::increaseDegree(PyObject * args)
Expand Down Expand Up @@ -249,14 +228,7 @@ PyObject* BSplineCurvePy::removeKnot(PyObject * args)
Handle_Geom_BSplineCurve curve = Handle_Geom_BSplineCurve::DownCast
(getGeometryPtr()->handle());
Standard_Boolean ok = curve->RemoveKnot(Index,M,tol);
if (ok) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(ok ? 1 : 0);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Expand Down Expand Up @@ -1106,14 +1078,7 @@ PyObject* BSplineCurvePy::join(PyObject *args)

bool ok = curve1->join(spline);

if (ok) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(ok ? 1 : 0);
}

PyObject* BSplineCurvePy::makeC1Continuous(PyObject *args)
Expand Down
72 changes: 8 additions & 64 deletions src/Mod/Part/App/BSplineSurfacePyImp.cpp
View file
Expand Up @@ -91,14 +91,7 @@ PyObject* BSplineSurfacePy::isURational(PyObject *args)
Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = surf->IsURational();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BSplineSurfacePy::isVRational(PyObject *args)
Expand All @@ -109,14 +102,7 @@ PyObject* BSplineSurfacePy::isVRational(PyObject *args)
Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = surf->IsVRational();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BSplineSurfacePy::isUPeriodic(PyObject *args)
Expand All @@ -127,14 +113,7 @@ PyObject* BSplineSurfacePy::isUPeriodic(PyObject *args)
Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = surf->IsUPeriodic();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BSplineSurfacePy::isVPeriodic(PyObject *args)
Expand All @@ -145,14 +124,7 @@ PyObject* BSplineSurfacePy::isVPeriodic(PyObject *args)
Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = surf->IsVPeriodic();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BSplineSurfacePy::isUClosed(PyObject *args)
Expand All @@ -163,14 +135,7 @@ PyObject* BSplineSurfacePy::isUClosed(PyObject *args)
Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = surf->IsUClosed();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BSplineSurfacePy::isVClosed(PyObject *args)
Expand All @@ -181,14 +146,7 @@ PyObject* BSplineSurfacePy::isVClosed(PyObject *args)
Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = surf->IsVPeriodic();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BSplineSurfacePy::increaseDegree(PyObject *args)
Expand Down Expand Up @@ -420,14 +378,7 @@ PyObject* BSplineSurfacePy::removeUKnot(PyObject *args)
Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast
(getGeometryPtr()->handle());
Standard_Boolean ok = surf->RemoveUKnot(Index,M,tol);
if (ok) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(ok ? 1 : 0);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Expand All @@ -447,14 +398,7 @@ PyObject* BSplineSurfacePy::removeVKnot(PyObject *args)
Handle_Geom_BSplineSurface surf = Handle_Geom_BSplineSurface::DownCast
(getGeometryPtr()->handle());
Standard_Boolean ok = surf->RemoveVKnot(Index,M,tol);
if (ok) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(ok ? 1 : 0);
}
catch (Standard_Failure) {
Handle_Standard_Failure e = Standard_Failure::Caught();
Expand Down
27 changes: 3 additions & 24 deletions src/Mod/Part/App/BezierCurvePyImp.cpp
View file
Expand Up @@ -64,14 +64,7 @@ PyObject* BezierCurvePy::isRational(PyObject *args)
Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = curve->IsRational();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BezierCurvePy::isPeriodic(PyObject *args)
Expand All @@ -81,14 +74,7 @@ PyObject* BezierCurvePy::isPeriodic(PyObject *args)
Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = curve->IsPeriodic();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BezierCurvePy::isClosed(PyObject *args)
Expand All @@ -98,14 +84,7 @@ PyObject* BezierCurvePy::isClosed(PyObject *args)
Handle_Geom_BezierCurve curve = Handle_Geom_BezierCurve::DownCast
(getGeometryPtr()->handle());
Standard_Boolean val = curve->IsClosed();
if (val) {
Py_INCREF(Py_True);
return Py_True;
}
else {
Py_INCREF(Py_False);
return Py_False;
}
return PyBool_FromLong(val ? 1 : 0);
}

PyObject* BezierCurvePy::increase(PyObject * args)
Expand Down

0 comments on commit 1a12d10

Please sign in to comment.