diff options
Diffstat (limited to 'tools/source/generic/poly.cxx')
| -rw-r--r-- | tools/source/generic/poly.cxx | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 4bfec2ec356f..52c4c5c4513c 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -768,8 +768,12 @@ Polygon::Polygon( const Point& rBezPt1, const Point& rCtrlPt1, { Point& rPt = mpImplPolygon->mpPointAry[ i ]; - fK_2 = fK_1, fK_3 = ( fK_2 *= fK_1 ), fK_3 *= fK_1; - fK1_2 = fK1_1, fK1_3 = ( fK1_2 *= fK1_1 ), fK1_3 *= fK1_1; + fK_2 = fK_1; + fK_3 = ( fK_2 *= fK_1 ); + fK_3 *= fK_1; + fK1_2 = fK1_1; + fK1_3 = ( fK1_2 *= fK1_1 ); + fK1_3 *= fK1_1; double fK12 = fK_1 * fK1_2; double fK21 = fK_2 * fK1_1; @@ -1129,7 +1133,7 @@ private: public: explicit Vector2D( const Point& rPair ) : mfX( rPair.A() ), mfY( rPair.B() ) {}; double GetLength() const { return hypot( mfX, mfY ); } - Vector2D& operator-=( const Vector2D& rVec ) { mfX -= rVec.mfX, mfY -= rVec.mfY; return *this; } + Vector2D& operator-=( const Vector2D& rVec ) { mfX -= rVec.mfX; mfY -= rVec.mfY; return *this; } double Scalar( const Vector2D& rVec ) const { return mfX * rVec.mfX + mfY * rVec.mfY ; } Vector2D& Normalize(); bool IsPositive( Vector2D& rVec ) const { return ( mfX * rVec.mfY - mfY * rVec.mfX ) >= 0.0; } @@ -1140,7 +1144,10 @@ Vector2D& Vector2D::Normalize() double fLen = Scalar( *this ); if( ( fLen != 0.0 ) && ( fLen != 1.0 ) && ( ( fLen = sqrt( fLen ) ) != 0.0 ) ) - mfX /= fLen, mfY /= fLen; + { + mfX /= fLen; + mfY /= fLen; + } return *this; } |