Kaydet (Commit) 73ffc462 authored tarafından Caolán McNamara's avatar Caolán McNamara

coverity#1326120 try and silence Constant expression result

Change-Id: Iafd034dd51135ad99f56279ceee1c770f91436b0
üst d7f3eed1
......@@ -446,7 +446,7 @@ namespace basegfx
: aVecA.getY() / aEdge.getY());
// relative end point of vector in edge range?
if(fTools::moreOrEqual(fScale, 0.0) && fTools::lessOrEqual(fScale, 1.0))
if (fTools::betweenOrEqualEither(fScale, 0.0, 1.0))
{
bAIsTrivial = true;
}
......@@ -468,7 +468,7 @@ namespace basegfx
: aVecB.getY() / aEdge.getY());
// end point of vector in edge range? Caution: controlB is directed AGAINST edge
if(fTools::lessOrEqual(fScale, 0.0) && fTools::moreOrEqual(fScale, -1.0))
if (fTools::betweenOrEqualEither(fScale, -1.0, 0.0))
{
bBIsTrivial = true;
}
......
......@@ -229,7 +229,7 @@ namespace basegfx
const double fOne(1.0);
fCut = (aVecB.getY() * (rCurrB.getX() - rCurrA.getX()) + aVecB.getX() * (rCurrA.getY() - rCurrB.getY())) / fCut;
if(fTools::moreOrEqual(fCut, fZero) && fTools::lessOrEqual(fCut, fOne))
if (fTools::betweenOrEqualEither(fCut, fZero, fOne))
{
// it's a candidate, but also need to test parameter value of cut on line 2
double fCut2;
......@@ -244,7 +244,7 @@ namespace basegfx
fCut2 = (rCurrA.getY() + (fCut * aVecA.getY()) - rCurrB.getY()) / aVecB.getY();
}
if(fTools::moreOrEqual(fCut2, fZero) && fTools::lessOrEqual(fCut2, fOne))
if (fTools::betweenOrEqualEither(fCut2, fZero, fOne))
{
// cut is in range, add point. Two edges can have only one cut, but
// add a cut point to each list. The lists may be the same for
......
......@@ -196,6 +196,12 @@ namespace basegfx
{
return (rfValA > rfValB || equal(rfValA, rfValB));
}
static bool betweenOrEqualEither(const double& rfValA, const double& rfValB, const double& rfValC)
{
return (rfValA > rfValB && rfValA < rfValC) || equal(rfValA, rfValB) || equal(rfValA, rfValC);
}
};
} // end of namespace basegfx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment