diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2023-10-08 13:14:39 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2023-10-08 18:53:00 +0200 |
commit | 347112fbd89ebd2a244052f14e085c9d3c90838d (patch) | |
tree | 07475c844d26adcec9333327524d9df71363610e /basegfx | |
parent | e64d85c9eb18642ed3a0526f3dd8db9a4b88e629 (diff) |
Drop temporary aliases from Tuple2D and Tuple3D
Change-Id: I091b68bbeee74452a3d6a03711cfc482b7a78e1d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157685
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'basegfx')
-rw-r--r-- | basegfx/source/point/b2dpoint.cxx | 12 | ||||
-rw-r--r-- | basegfx/source/point/b3dpoint.cxx | 30 | ||||
-rw-r--r-- | basegfx/source/vector/b2dvector.cxx | 38 | ||||
-rw-r--r-- | basegfx/source/vector/b3dvector.cxx | 18 |
4 files changed, 49 insertions, 49 deletions
diff --git a/basegfx/source/point/b2dpoint.cxx b/basegfx/source/point/b2dpoint.cxx index 1d7f75158526..d12c3dd04c4f 100644 --- a/basegfx/source/point/b2dpoint.cxx +++ b/basegfx/source/point/b2dpoint.cxx @@ -26,16 +26,16 @@ namespace basegfx B2DPoint& B2DPoint::operator*=( const ::basegfx::B2DHomMatrix& rMat ) { double fTempX( - rMat.get(0, 0) * mfX + - rMat.get(0, 1) * mfY + + rMat.get(0, 0) * mnX + + rMat.get(0, 1) * mnY + rMat.get(0, 2)); double fTempY( - rMat.get(1, 0) * mfX + - rMat.get(1, 1) * mfY + + rMat.get(1, 0) * mnX + + rMat.get(1, 1) * mnY + rMat.get(1, 2)); - mfX = fTempX; - mfY = fTempY; + mnX = fTempX; + mnY = fTempY; return *this; } diff --git a/basegfx/source/point/b3dpoint.cxx b/basegfx/source/point/b3dpoint.cxx index ff70b501ed7a..7d2d4cf4a22b 100644 --- a/basegfx/source/point/b3dpoint.cxx +++ b/basegfx/source/point/b3dpoint.cxx @@ -26,28 +26,28 @@ namespace basegfx B3DPoint& B3DPoint::operator*=( const ::basegfx::B3DHomMatrix& rMat ) { double fTempX( - rMat.get(0, 0) * mfX + - rMat.get(0, 1) * mfY + - rMat.get(0, 2) * mfZ + + rMat.get(0, 0) * mnX + + rMat.get(0, 1) * mnY + + rMat.get(0, 2) * mnZ + rMat.get(0, 3)); double fTempY( - rMat.get(1, 0) * mfX + - rMat.get(1, 1) * mfY + - rMat.get(1, 2) * mfZ + + rMat.get(1, 0) * mnX + + rMat.get(1, 1) * mnY + + rMat.get(1, 2) * mnZ + rMat.get(1, 3)); double fTempZ( - rMat.get(2, 0) * mfX + - rMat.get(2, 1) * mfY + - rMat.get(2, 2) * mfZ + + rMat.get(2, 0) * mnX + + rMat.get(2, 1) * mnY + + rMat.get(2, 2) * mnZ + rMat.get(2, 3)); if(!rMat.isLastLineDefault()) { const double fOne(1.0); const double fTempM( - rMat.get(3, 0) * mfX + - rMat.get(3, 1) * mfY + - rMat.get(3, 2) * mfZ + + rMat.get(3, 0) * mnX + + rMat.get(3, 1) * mnY + + rMat.get(3, 2) * mnZ + rMat.get(3, 3)); if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM)) @@ -58,9 +58,9 @@ namespace basegfx } } - mfX = fTempX; - mfY = fTempY; - mfZ = fTempZ; + mnX = fTempX; + mnY = fTempY; + mnZ = fTempZ; return *this; } diff --git a/basegfx/source/vector/b2dvector.cxx b/basegfx/source/vector/b2dvector.cxx index d0fcebb62eac..85ec6ca81116 100644 --- a/basegfx/source/vector/b2dvector.cxx +++ b/basegfx/source/vector/b2dvector.cxx @@ -29,8 +29,8 @@ namespace basegfx if(fTools::equalZero(fLen)) { - mfX = 0.0; - mfY = 0.0; + mnX = 0.0; + mnY = 0.0; } else { @@ -42,8 +42,8 @@ namespace basegfx if(!fTools::equalZero(fLen)) { - mfX /= fLen; - mfY /= fLen; + mnX /= fLen; + mnY /= fLen; } } } @@ -53,22 +53,22 @@ namespace basegfx double B2DVector::getLength() const { - if(fTools::equalZero(mfX)) + if(fTools::equalZero(mnX)) { - return fabs(mfY); + return fabs(mnY); } - else if(fTools::equalZero(mfY)) + else if(fTools::equalZero(mnY)) { - return fabs(mfX); + return fabs(mnX); } - return hypot( mfX, mfY ); + return hypot( mnX, mnY ); } double B2DVector::angle( const B2DVector& rVec ) const { - return atan2(mfX * rVec.getY() - mfY * rVec.getX(), - mfX * rVec.getX() + mfY * rVec.getY()); + return atan2(mnX * rVec.getY() - mnY * rVec.getX(), + mnX * rVec.getX() + mnY * rVec.getY()); } const B2DVector& B2DVector::getEmptyVector() @@ -78,12 +78,12 @@ namespace basegfx B2DVector& B2DVector::operator*=( const B2DHomMatrix& rMat ) { - const double fTempX( rMat.get(0,0)*mfX + - rMat.get(0,1)*mfY ); - const double fTempY( rMat.get(1,0)*mfX + - rMat.get(1,1)*mfY ); - mfX = fTempX; - mfY = fTempY; + const double fTempX( rMat.get(0,0)*mnX + + rMat.get(0,1)*mnY ); + const double fTempY( rMat.get(1,0)*mnX + + rMat.get(1,1)*mnY ); + mnX = fTempX; + mnY = fTempY; return *this; } @@ -101,8 +101,8 @@ namespace basegfx fLen /= sqrt(fLenNow); } - mfX *= fLen; - mfY *= fLen; + mnX *= fLen; + mnY *= fLen; } return *this; diff --git a/basegfx/source/vector/b3dvector.cxx b/basegfx/source/vector/b3dvector.cxx index 002ee330f9f4..89bc33c2bd9e 100644 --- a/basegfx/source/vector/b3dvector.cxx +++ b/basegfx/source/vector/b3dvector.cxx @@ -34,9 +34,9 @@ namespace basegfx { fLen = sqrt(fLen); - mfX /= fLen; - mfY /= fLen; - mfZ /= fLen; + mnX /= fLen; + mnY /= fLen; + mnZ /= fLen; } } @@ -52,12 +52,12 @@ namespace basegfx B3DVector& B3DVector::operator*=( const ::basegfx::B3DHomMatrix& rMat ) { - const double fTempX( rMat.get(0,0)*mfX + rMat.get(0,1)*mfY + rMat.get(0,2)*mfZ ); - const double fTempY( rMat.get(1,0)*mfX + rMat.get(1,1)*mfY + rMat.get(1,2)*mfZ ); - const double fTempZ( rMat.get(2,0)*mfX + rMat.get(2,1)*mfY + rMat.get(2,2)*mfZ ); - mfX = fTempX; - mfY = fTempY; - mfZ = fTempZ; + const double fTempX( rMat.get(0,0)*mnX + rMat.get(0,1)*mnY + rMat.get(0,2)*mnZ ); + const double fTempY( rMat.get(1,0)*mnX + rMat.get(1,1)*mnY + rMat.get(1,2)*mnZ ); + const double fTempZ( rMat.get(2,0)*mnX + rMat.get(2,1)*mnY + rMat.get(2,2)*mnZ ); + mnX = fTempX; + mnY = fTempY; + mnZ = fTempZ; return *this; } |