strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS aw051 (1.15.30); FILE MERGED

Browse source 
2007/06/15 13:29:21 aw 1.15.30.1: #i77162# 3rd round of adaptions to B2DPolygon bezier handling
This commit is contained in:
Oliver Bolte 2007-07-18 10:08:22 +00:00
parent 7a33932b43
commit 59e5a09de1
1 changed files with 21 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
basegfx/source/vector/b2dvector.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: b2dvector.cxx,v $
*
* $Revision: 1.15 $
* $Revision: 1.16 $
*
* last change: $Author: obo $ $Date: 2006-09-17 08:07:57 $
* last change: $Author: obo $ $Date: 2007-07-18 11:08:22 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -154,8 +154,10 @@ namespace basegfx
bool areParallel( const B2DVector& rVecA, const B2DVector& rVecB )
{
double fVal(rVecA.getX() * rVecB.getY() - rVecA.getY() * rVecB.getX());
return fTools::equalZero(fVal);
const double fValA(rVecA.getX() * rVecB.getY());
const double fValB(rVecA.getY() * rVecB.getX());
return fTools::equal(fValA, fValB);
}
B2VectorOrientation getOrientation( const B2DVector& rVecA, const B2DVector& rVecB )
@ -201,24 +203,24 @@ namespace basegfx
B2VectorContinuity getContinuity(const B2DVector& rBackVector, const B2DVector& rForwardVector )
{
B2VectorContinuity eRetval(CONTINUITY_NONE);
if(!rBackVector.equalZero() && !rForwardVector.equalZero())
if(rBackVector.equalZero() || rForwardVector.equalZero())
{
if( fTools::equal(rBackVector.getX(), -rForwardVector.getX()) &&
fTools::equal(rBackVector.getY(), -rForwardVector.getY()))
{
// same direction and same length -> C2
eRetval = CONTINUITY_C2;
}
else if(areParallel(rBackVector, rForwardVector))
{
// same direction -> C1
eRetval = CONTINUITY_C1;
}
return CONTINUITY_NONE;
}
return eRetval;
if(fTools::equal(rBackVector.getX(), -rForwardVector.getX()) && fTools::equal(rBackVector.getY(), -rForwardVector.getY()))
{
// same direction and same length -> C2
return CONTINUITY_C2;
}
if(areParallel(rBackVector, rForwardVector))
{
// same direction -> C1
return CONTINUITY_C1;
}
return CONTINUITY_NONE;
}
} // end of namespace basegfx