6 files changed, 198 insertions, 0 deletions
diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx
index 9f7d5bff0156..466e9037d149 100644
--- a/basegfx/source/matrix/b2dhommatrix.cxx
+++ b/basegfx/source/matrix/b2dhommatrix.cxx
@@ -115,6 +115,11 @@ namespace basegfx
 
     bool B2DHomMatrix::invert()
     {
+        if(isIdentity())
+        {
+            return true;
+        }
+
         Impl2DHomMatrix aWork(*mpImpl);
         std::unique_ptr<sal_uInt16[]> pIndex( new sal_uInt16[Impl2DHomMatrix_Base::getEdgeLength()] );
         sal_Int16 nParity;
@@ -213,6 +218,11 @@ namespace basegfx
         }
     }
 
+    void B2DHomMatrix::translate(const B2DTuple& rTuple)
+    {
+        translate(rTuple.getX(), rTuple.getY());
+    }
+
     void B2DHomMatrix::scale(double fX, double fY)
     {
         const double fOne(1.0);
@@ -228,6 +238,11 @@ namespace basegfx
         }
     }
 
+    void B2DHomMatrix::scale(const B2DTuple& rTuple)
+    {
+        scale(rTuple.getX(), rTuple.getY());
+    }
+
     void B2DHomMatrix::shearX(double fSx)
     {
         // #i76239# do not test against 1.0, but against 0.0. We are talking about a value not on the diagonal (!)
diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx
index 6cfd054992ec..b55dd079b514 100644
--- a/basegfx/source/matrix/b3dhommatrix.cxx
+++ b/basegfx/source/matrix/b3dhommatrix.cxx
@@ -203,6 +203,11 @@ namespace basegfx
         }
     }
 
+    void B3DHomMatrix::rotate(const B3DTuple& rRotation)
+    {
+        rotate(rRotation.getX(), rRotation.getY(), rRotation.getZ());
+    }
+
     void B3DHomMatrix::translate(double fX, double fY, double fZ)
     {
         if(!fTools::equalZero(fX) || !fTools::equalZero(fY) || !fTools::equalZero(fZ))
@@ -217,6 +222,11 @@ namespace basegfx
         }
     }
 
+    void B3DHomMatrix::translate(const B3DTuple& rRotation)
+    {
+        translate(rRotation.getX(), rRotation.getY(), rRotation.getZ());
+    }
+
     void B3DHomMatrix::scale(double fX, double fY, double fZ)
     {
         const double fOne(1.0);
@@ -233,6 +243,11 @@ namespace basegfx
         }
     }
 
+    void B3DHomMatrix::scale(const B3DTuple& rRotation)
+    {
+        scale(rRotation.getX(), rRotation.getY(), rRotation.getZ());
+    }
+
     void B3DHomMatrix::shearXY(double fSx, double fSy)
     {
         // #i76239# do not test against 1.0, but against 0.0. We are talking about a value not on the diagonal (!)
diff --git a/basegfx/source/matrix/b3dhommatrixtools.cxx b/basegfx/source/matrix/b3dhommatrixtools.cxx
new file mode 100755
index 000000000000..677c978545ee
--- /dev/null
+++ b/basegfx/source/matrix/b3dhommatrixtools.cxx
@@ -0,0 +1,76 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#include <basegfx/matrix/b3dhommatrixtools.hxx>
+
+namespace basegfx
+{
+    namespace utils
+    {
+        B3DHomMatrix UnoHomogenMatrixToB3DHomMatrix(
+            const com::sun::star::drawing::HomogenMatrix& rMatrixIn)
+        {
+            B3DHomMatrix aRetval;
+
+            aRetval.set(0, 0, rMatrixIn.Line1.Column1);
+            aRetval.set(0, 1, rMatrixIn.Line1.Column2);
+            aRetval.set(0, 2, rMatrixIn.Line1.Column3);
+            aRetval.set(0, 3, rMatrixIn.Line1.Column4);
+            aRetval.set(1, 0, rMatrixIn.Line2.Column1);
+            aRetval.set(1, 1, rMatrixIn.Line2.Column2);
+            aRetval.set(1, 2, rMatrixIn.Line2.Column3);
+            aRetval.set(1, 3, rMatrixIn.Line2.Column4);
+            aRetval.set(2, 0, rMatrixIn.Line3.Column1);
+            aRetval.set(2, 1, rMatrixIn.Line3.Column2);
+            aRetval.set(2, 2, rMatrixIn.Line3.Column3);
+            aRetval.set(2, 3, rMatrixIn.Line3.Column4);
+            aRetval.set(3, 0, rMatrixIn.Line4.Column1);
+            aRetval.set(3, 1, rMatrixIn.Line4.Column2);
+            aRetval.set(3, 2, rMatrixIn.Line4.Column3);
+            aRetval.set(3, 3, rMatrixIn.Line4.Column4);
+
+            return aRetval;
+        }
+
+        void B3DHomMatrixToUnoHomogenMatrix(
+            const B3DHomMatrix& rMatrixIn,
+            com::sun::star::drawing::HomogenMatrix& rMatrixOut)
+        {
+            rMatrixOut.Line1.Column1 = rMatrixIn.get(0, 0);
+            rMatrixOut.Line1.Column2 = rMatrixIn.get(0, 1);
+            rMatrixOut.Line1.Column3 = rMatrixIn.get(0, 2);
+            rMatrixOut.Line1.Column4 = rMatrixIn.get(0, 3);
+            rMatrixOut.Line2.Column1 = rMatrixIn.get(1, 0);
+            rMatrixOut.Line2.Column2 = rMatrixIn.get(1, 1);
+            rMatrixOut.Line2.Column3 = rMatrixIn.get(1, 2);
+            rMatrixOut.Line2.Column4 = rMatrixIn.get(1, 3);
+            rMatrixOut.Line3.Column1 = rMatrixIn.get(2, 0);
+            rMatrixOut.Line3.Column2 = rMatrixIn.get(2, 1);
+            rMatrixOut.Line3.Column3 = rMatrixIn.get(2, 2);
+            rMatrixOut.Line3.Column4 = rMatrixIn.get(2, 3);
+            rMatrixOut.Line4.Column1 = rMatrixIn.get(3, 0);
+            rMatrixOut.Line4.Column2 = rMatrixIn.get(3, 1);
+            rMatrixOut.Line4.Column3 = rMatrixIn.get(3, 2);
+            rMatrixOut.Line4.Column4 = rMatrixIn.get(3, 3);
+        }
+
+    } // end of namespace tools
+} // end of namespace basegfx
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/numeric/ftools.cxx b/basegfx/source/numeric/ftools.cxx
index 994bd29e30eb..d1eca66ca2fc 100644
--- a/basegfx/source/numeric/ftools.cxx
+++ b/basegfx/source/numeric/ftools.cxx
@@ -45,6 +45,59 @@ namespace basegfx
         }
     }
 
+    double snapToZeroRange(double v, double fWidth)
+    {
+        if(fTools::equalZero(fWidth))
+        {
+            // with no range all snaps to range bound
+            return 0.0;
+        }
+        else
+        {
+            if(v < 0.0 || v > fWidth)
+            {
+                double fRetval(fmod(v, fWidth));
+
+                if(fRetval < 0.0)
+                {
+                    fRetval += fWidth;
+                }
+
+                return fRetval;
+            }
+            else
+            {
+                return v;
+            }
+        }
+    }
+
+    double snapToRange(double v, double fLow, double fHigh)
+    {
+        if(fTools::equal(fLow, fHigh))
+        {
+            // with no range all snaps to range bound
+            return 0.0;
+        }
+        else
+        {
+            if(fLow > fHigh)
+            {
+                // correct range order. Evtl. assert this (?)
+                std::swap(fLow, fHigh);
+            }
+
+            if(v < fLow || v > fHigh)
+            {
+                return snapToZeroRange(v - fLow, fHigh - fLow) + fLow;
+            }
+            else
+            {
+                return v;
+            }
+        }
+    }
+
     double normalizeToRange(double v, const double fRange)
     {
         if(fTools::lessOrEqual(fRange, 0.0))
diff --git a/basegfx/source/range/b2drange.cxx b/basegfx/source/range/b2drange.cxx
index 2f4a3e08e69e..331c5431bcf3 100644
--- a/basegfx/source/range/b2drange.cxx
+++ b/basegfx/source/range/b2drange.cxx
@@ -51,6 +51,19 @@ namespace basegfx
         }
     }
 
+    B2DRange& B2DRange::operator*=( const ::basegfx::B2DHomMatrix& rMat )
+    {
+        transform(rMat);
+        return *this;
+    }
+
+    const B2DRange& B2DRange::getUnitB2DRange()
+    {
+        static const B2DRange aUnitB2DRange(0.0, 0.0, 1.0, 1.0);
+
+        return aUnitB2DRange;
+    }
+
     B2IRange fround(const B2DRange& rRange)
     {
         return rRange.isEmpty() ?
@@ -58,6 +71,13 @@ namespace basegfx
             B2IRange(fround(rRange.getMinimum()),
                      fround(rRange.getMaximum()));
     }
+
+    B2DRange operator*( const ::basegfx::B2DHomMatrix& rMat, const B2DRange& rB2DRange )
+    {
+        B2DRange aRes( rB2DRange );
+        return aRes *= rMat;
+    }
+
 } // end of namespace basegfx
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basegfx/source/range/b3drange.cxx b/basegfx/source/range/b3drange.cxx
index f779f1855d79..879dbb0f9974 100644
--- a/basegfx/source/range/b3drange.cxx
+++ b/basegfx/source/range/b3drange.cxx
@@ -40,6 +40,25 @@ namespace basegfx
         }
     }
 
+    B3DRange& B3DRange::operator*=( const ::basegfx::B3DHomMatrix& rMat )
+    {
+        transform(rMat);
+        return *this;
+    }
+
+    const B3DRange& B3DRange::getUnitB3DRange()
+    {
+        static const B3DRange aUnitB3DRange(0.0, 0.0, 0.0, 1.0, 1.0, 1.0);
+
+        return aUnitB3DRange;
+    }
+
+    B3DRange operator*( const ::basegfx::B3DHomMatrix& rMat, const B3DRange& rB3DRange )
+    {
+        B3DRange aRes( rB3DRange );
+        return aRes *= rMat;
+    }
+
 } // end of namespace basegfx
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */