basegfx/source/matrix/b2dhommatrix.cxx | 92 +++++++++------------------
basegfx/source/matrix/b3dhommatrix.cxx | 2
include/basegfx/matrix/b2dhommatrix.hxx | 27 ++++---
include/basegfx/matrix/hommatrixtemplate.hxx | 3
solenv/clang-format/excludelist | 2
5 files changed, 51 insertions(+), 75 deletions(-)
New commits:
commit 83650c82b56f496cd165981aa34edef9d5547697
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon May 15 15:28:34 2023 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue May 16 07:57:51 2023 +0200
tdf#63130 make B2DHomMatrix a flat object
instead of using COW for its data.
This takes the load time from 1m29 to 1m12
Also fix a bug in
ImplHomMatrixTemplate::operator=
which never triggered before because the usage
of o3tl::cow_wrapper means it very seldom gets used.
Change-Id: Ib0a7bdddf6c014f583e06d15e8dce5025e67e4a1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151793
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/basegfx/source/matrix/b2dhommatrix.cxx
b/basegfx/source/matrix/b2dhommatrix.cxx
index 9811304ccccd..565be5c68b1c 100644
--- a/basegfx/source/matrix/b2dhommatrix.cxx
+++ b/basegfx/source/matrix/b2dhommatrix.cxx
@@ -18,7 +18,7 @@
*/
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <hommatrixtemplate.hxx>
+#include <basegfx/matrix/hommatrixtemplate.hxx>
#include <basegfx/tuple/b2dtuple.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/matrix/b2dhommatrixtools.hxx>
@@ -26,73 +26,50 @@
namespace basegfx
{
- typedef ::basegfx::internal::ImplHomMatrixTemplate< 3 >
Impl2DHomMatrix_Base;
- class Impl2DHomMatrix : public Impl2DHomMatrix_Base
- {
- };
-
- static o3tl::cow_wrapper<Impl2DHomMatrix> DEFAULT;
-
- B2DHomMatrix::B2DHomMatrix() : mpImpl(DEFAULT) {}
-
- B2DHomMatrix::B2DHomMatrix(const B2DHomMatrix&) = default;
-
- B2DHomMatrix::B2DHomMatrix(B2DHomMatrix&&) = default;
-
- B2DHomMatrix::~B2DHomMatrix() = default;
B2DHomMatrix::B2DHomMatrix(double f_0x0, double f_0x1, double f_0x2,
double f_1x0, double f_1x1, double f_1x2)
{
- mpImpl->set(0, 0, f_0x0);
- mpImpl->set(0, 1, f_0x1);
- mpImpl->set(0, 2, f_0x2);
- mpImpl->set(1, 0, f_1x0);
- mpImpl->set(1, 1, f_1x1);
- mpImpl->set(1, 2, f_1x2);
- }
-
- B2DHomMatrix& B2DHomMatrix::operator=(const B2DHomMatrix&) = default;
-
- B2DHomMatrix& B2DHomMatrix::operator=(B2DHomMatrix&&) = default;
-
- double B2DHomMatrix::get(sal_uInt16 nRow, sal_uInt16 nColumn) const
- {
- return mpImpl->get(nRow, nColumn);
+ maImpl.set(0, 0, f_0x0);
+ maImpl.set(0, 1, f_0x1);
+ maImpl.set(0, 2, f_0x2);
+ maImpl.set(1, 0, f_1x0);
+ maImpl.set(1, 1, f_1x1);
+ maImpl.set(1, 2, f_1x2);
}
void B2DHomMatrix::set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue)
{
- mpImpl->set(nRow, nColumn, fValue);
+ maImpl.set(nRow, nColumn, fValue);
}
void B2DHomMatrix::set3x2(double f_0x0, double f_0x1, double f_0x2, double
f_1x0, double f_1x1, double f_1x2)
{
- mpImpl->set(0, 0, f_0x0);
- mpImpl->set(0, 1, f_0x1);
- mpImpl->set(0, 2, f_0x2);
- mpImpl->set(1, 0, f_1x0);
- mpImpl->set(1, 1, f_1x1);
- mpImpl->set(1, 2, f_1x2);
+ maImpl.set(0, 0, f_0x0);
+ maImpl.set(0, 1, f_0x1);
+ maImpl.set(0, 2, f_0x2);
+ maImpl.set(1, 0, f_1x0);
+ maImpl.set(1, 1, f_1x1);
+ maImpl.set(1, 2, f_1x2);
}
bool B2DHomMatrix::isLastLineDefault() const
{
- return mpImpl->isLastLineDefault();
+ return maImpl.isLastLineDefault();
}
bool B2DHomMatrix::isIdentity() const
{
- return mpImpl.same_object(DEFAULT) || mpImpl->isIdentity();
+ return maImpl.isIdentity();
}
void B2DHomMatrix::identity()
{
- *mpImpl = Impl2DHomMatrix();
+ maImpl = Impl2DHomMatrix();
}
bool B2DHomMatrix::isInvertible() const
{
- return mpImpl->isInvertible();
+ return maImpl.isInvertible();
}
bool B2DHomMatrix::invert()
@@ -102,13 +79,13 @@ namespace basegfx
return true;
}
- Impl2DHomMatrix aWork(*mpImpl);
- sal_uInt16* pIndex = static_cast<sal_uInt16*>(alloca(
sizeof(sal_uInt16) * Impl2DHomMatrix_Base::getEdgeLength() ));
+ Impl2DHomMatrix aWork(maImpl);
+ sal_uInt16* pIndex = static_cast<sal_uInt16*>(alloca(
sizeof(sal_uInt16) * Impl2DHomMatrix::getEdgeLength() ));
sal_Int16 nParity;
if(aWork.ludcmp(pIndex, nParity))
{
- mpImpl->doInvert(aWork, pIndex);
+ maImpl.doInvert(aWork, pIndex);
return true;
}
@@ -117,13 +94,13 @@ namespace basegfx
B2DHomMatrix& B2DHomMatrix::operator+=(const B2DHomMatrix& rMat)
{
- mpImpl->doAddMatrix(*rMat.mpImpl);
+ maImpl.doAddMatrix(rMat.maImpl);
return *this;
}
B2DHomMatrix& B2DHomMatrix::operator-=(const B2DHomMatrix& rMat)
{
- mpImpl->doSubMatrix(*rMat.mpImpl);
+ maImpl.doSubMatrix(rMat.maImpl);
return *this;
}
@@ -132,7 +109,7 @@ namespace basegfx
const double fOne(1.0);
if(!fTools::equal(fOne, fValue))
- mpImpl->doMulMatrix(fValue);
+ maImpl.doMulMatrix(fValue);
return *this;
}
@@ -142,7 +119,7 @@ namespace basegfx
const double fOne(1.0);
if(!fTools::equal(fOne, fValue))
- mpImpl->doMulMatrix(1.0 / fValue);
+ maImpl.doMulMatrix(1.0 / fValue);
return *this;
}
@@ -161,7 +138,7 @@ namespace basegfx
else
{
// multiply
- mpImpl->doMulMatrix(*rMat.mpImpl);
+ maImpl.doMulMatrix(rMat.maImpl);
}
return *this;
@@ -169,10 +146,7 @@ namespace basegfx
bool B2DHomMatrix::operator==(const B2DHomMatrix& rMat) const
{
- if(mpImpl.same_object(rMat.mpImpl))
- return true;
-
- return mpImpl->isEqual(*rMat.mpImpl);
+ return &rMat == this || maImpl.isEqual(rMat.maImpl);
}
bool B2DHomMatrix::operator!=(const B2DHomMatrix& rMat) const
@@ -196,7 +170,7 @@ namespace basegfx
aRotMat.set(1, 0, fSin);
aRotMat.set(0, 1, -fSin);
- mpImpl->doMulMatrix(aRotMat);
+ maImpl.doMulMatrix(aRotMat);
}
void B2DHomMatrix::translate(double fX, double fY)
@@ -208,7 +182,7 @@ namespace basegfx
aTransMat.set(0, 2, fX);
aTransMat.set(1, 2, fY);
- mpImpl->doMulMatrix(aTransMat);
+ maImpl.doMulMatrix(aTransMat);
}
}
@@ -228,7 +202,7 @@ namespace basegfx
aScaleMat.set(0, 0, fX);
aScaleMat.set(1, 1, fY);
- mpImpl->doMulMatrix(aScaleMat);
+ maImpl.doMulMatrix(aScaleMat);
}
}
@@ -246,7 +220,7 @@ namespace basegfx
aShearXMat.set(0, 1, fSx);
- mpImpl->doMulMatrix(aShearXMat);
+ maImpl.doMulMatrix(aShearXMat);
}
}
@@ -259,7 +233,7 @@ namespace basegfx
aShearYMat.set(1, 0, fSy);
- mpImpl->doMulMatrix(aShearYMat);
+ maImpl.doMulMatrix(aShearYMat);
}
}
@@ -273,7 +247,7 @@ namespace basegfx
bool B2DHomMatrix::decompose(B2DTuple& rScale, B2DTuple& rTranslate,
double& rRotate, double& rShearX) const
{
// when perspective is used, decompose is not made here
- if(!mpImpl->isLastLineDefault())
+ if(!maImpl.isLastLineDefault())
{
return false;
}
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx
b/basegfx/source/matrix/b3dhommatrix.cxx
index 3605767d681d..f9018c69793f 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -18,7 +18,7 @@
*/
#include <basegfx/matrix/b3dhommatrix.hxx>
-#include <hommatrixtemplate.hxx>
+#include <basegfx/matrix/hommatrixtemplate.hxx>
#include <basegfx/vector/b3dvector.hxx>
#include <memory>
diff --git a/include/basegfx/matrix/b2dhommatrix.hxx
b/include/basegfx/matrix/b2dhommatrix.hxx
index e1fc6126c1e1..e1fbf60dee1a 100644
--- a/include/basegfx/matrix/b2dhommatrix.hxx
+++ b/include/basegfx/matrix/b2dhommatrix.hxx
@@ -24,27 +24,24 @@
#include <ostream>
#include <sal/types.h>
-#include <o3tl/cow_wrapper.hxx>
#include <basegfx/basegfxdllapi.h>
+#include <basegfx/matrix/hommatrixtemplate.hxx>
namespace basegfx
{
class B2DTuple;
- class Impl2DHomMatrix;
+
+ using Impl2DHomMatrix = ::basegfx::internal::ImplHomMatrixTemplate< 3 >;
class SAL_WARN_UNUSED BASEGFX_DLLPUBLIC B2DHomMatrix
{
- public:
- typedef o3tl::cow_wrapper< Impl2DHomMatrix > ImplType;
-
private:
- ImplType mpImpl;
+ Impl2DHomMatrix maImpl;
public:
- B2DHomMatrix();
- B2DHomMatrix(const B2DHomMatrix& rMat);
- B2DHomMatrix(B2DHomMatrix&& rMat);
- ~B2DHomMatrix();
+ B2DHomMatrix() {}
+ B2DHomMatrix(const B2DHomMatrix& rMat) = default;
+ B2DHomMatrix(B2DHomMatrix&& rMat) = default;
/** Convenience creator for declaration of the matrix that is commonly
used by web standards (SVG, CSS, HTML).
@@ -78,7 +75,11 @@ namespace basegfx
*/
B2DHomMatrix(double f_0x0, double f_0x1, double f_0x2, double f_1x0,
double f_1x1, double f_1x2);
- double get(sal_uInt16 nRow, sal_uInt16 nColumn) const;
+ double get(sal_uInt16 nRow, sal_uInt16 nColumn) const
+ {
+ return maImpl.get(nRow, nColumn);
+ }
+
void set(sal_uInt16 nRow, sal_uInt16 nColumn, double fValue);
/** allow setting all needed values for a 3x2 matrix in one call. The
@@ -122,8 +123,8 @@ namespace basegfx
B2DHomMatrix& operator*=(const B2DHomMatrix& rMat);
// assignment operator
- B2DHomMatrix& operator=(const B2DHomMatrix& rMat);
- B2DHomMatrix& operator=(B2DHomMatrix&& rMat);
+ B2DHomMatrix& operator=(const B2DHomMatrix& rMat) = default;
+ B2DHomMatrix& operator=(B2DHomMatrix&& rMat) = default;
/**
* Help routine to decompose given homogen 3x3 matrix to components. A
correction of the
diff --git a/basegfx/source/inc/hommatrixtemplate.hxx
b/include/basegfx/matrix/hommatrixtemplate.hxx
similarity index 99%
rename from basegfx/source/inc/hommatrixtemplate.hxx
rename to include/basegfx/matrix/hommatrixtemplate.hxx
index a80df114c3e3..e31c522c7711 100644
--- a/basegfx/source/inc/hommatrixtemplate.hxx
+++ b/include/basegfx/matrix/hommatrixtemplate.hxx
@@ -29,7 +29,7 @@
namespace basegfx::internal
{
- inline double implGetDefaultValue(sal_uInt16 nRow, sal_uInt16 nColumn)
+ inline constexpr double implGetDefaultValue(sal_uInt16 nRow,
sal_uInt16 nColumn)
{
if(nRow == nColumn)
return 1.0;
@@ -125,6 +125,7 @@ namespace basegfx::internal
{
memcpy(&maLine[a], &rToBeCopied.maLine[a],
sizeof(ImplMatLine< RowSize >));
}
+ mpLine.reset();
if(rToBeCopied.mpLine)
{
mpLine.reset( new ImplMatLine< RowSize >((RowSize -
1), rToBeCopied.mpLine.get()) );
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 70211a98369f..55666de2c6e3 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -243,7 +243,6 @@ basegfx/source/color/bcolormodifier.cxx
basegfx/source/color/bcolortools.cxx
basegfx/source/curve/b2dbeziertools.cxx
basegfx/source/curve/b2dcubicbezier.cxx
-basegfx/source/inc/hommatrixtemplate.hxx
basegfx/source/inc/stringconversiontools.hxx
basegfx/source/matrix/b2dhommatrix.cxx
basegfx/source/matrix/b2dhommatrixtools.cxx
@@ -4753,6 +4752,7 @@ include/basegfx/curve/b2dcubicbezier.hxx
include/basegfx/matrix/b2dhommatrix.hxx
include/basegfx/matrix/b2dhommatrixtools.hxx
include/basegfx/matrix/b3dhommatrix.hxx
+include/basegfx/matrix/hommatrixtemplate.hxx
include/basegfx/numeric/ftools.hxx
include/basegfx/pixel/bpixel.hxx
include/basegfx/point/b2dpoint.hxx
