From eba4d5b2b76cefde90cb3d6638c736f435023a45 Mon Sep 17 00:00:00 2001 From: Armin Le Grand Date: Fri, 6 Apr 2018 22:32:24 +0200 Subject: Revert "SOSAW080: Added first bunch of basic changes to helpers" This reverts commit 6c14c27c75a03e2363f2b363ddf0a6f2f46cfa91. --- basegfx/Library_basegfx.mk | 1 - basegfx/source/matrix/b2dhommatrix.cxx | 15 ------ basegfx/source/matrix/b3dhommatrix.cxx | 15 ------ basegfx/source/matrix/b3dhommatrixtools.cxx | 76 ----------------------------- basegfx/source/numeric/ftools.cxx | 53 -------------------- basegfx/source/range/b2drange.cxx | 20 -------- basegfx/source/range/b3drange.cxx | 19 -------- 7 files changed, 199 deletions(-) delete mode 100755 basegfx/source/matrix/b3dhommatrixtools.cxx (limited to 'basegfx') diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk index de744b5a15ce..087e4a081419 100644 --- a/basegfx/Library_basegfx.mk +++ b/basegfx/Library_basegfx.mk @@ -38,7 +38,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\ basegfx/source/matrix/b2dhommatrix \ basegfx/source/matrix/b2dhommatrixtools \ basegfx/source/matrix/b3dhommatrix \ - basegfx/source/matrix/b3dhommatrixtools \ basegfx/source/numeric/ftools \ basegfx/source/pixel/bpixel \ basegfx/source/point/b2dpoint \ diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx index 466e9037d149..9f7d5bff0156 100644 --- a/basegfx/source/matrix/b2dhommatrix.cxx +++ b/basegfx/source/matrix/b2dhommatrix.cxx @@ -115,11 +115,6 @@ namespace basegfx bool B2DHomMatrix::invert() { - if(isIdentity()) - { - return true; - } - Impl2DHomMatrix aWork(*mpImpl); std::unique_ptr pIndex( new sal_uInt16[Impl2DHomMatrix_Base::getEdgeLength()] ); sal_Int16 nParity; @@ -218,11 +213,6 @@ 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); @@ -238,11 +228,6 @@ 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 b55dd079b514..6cfd054992ec 100644 --- a/basegfx/source/matrix/b3dhommatrix.cxx +++ b/basegfx/source/matrix/b3dhommatrix.cxx @@ -203,11 +203,6 @@ 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)) @@ -222,11 +217,6 @@ 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); @@ -243,11 +233,6 @@ 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 deleted file mode 100755 index 677c978545ee..000000000000 --- a/basegfx/source/matrix/b3dhommatrixtools.cxx +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- 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 - -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 d1eca66ca2fc..994bd29e30eb 100644 --- a/basegfx/source/numeric/ftools.cxx +++ b/basegfx/source/numeric/ftools.cxx @@ -45,59 +45,6 @@ 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 331c5431bcf3..2f4a3e08e69e 100644 --- a/basegfx/source/range/b2drange.cxx +++ b/basegfx/source/range/b2drange.cxx @@ -51,19 +51,6 @@ 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() ? @@ -71,13 +58,6 @@ 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 879dbb0f9974..f779f1855d79 100644 --- a/basegfx/source/range/b3drange.cxx +++ b/basegfx/source/range/b3drange.cxx @@ -40,25 +40,6 @@ 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: */ -- cgit