diff options
author | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-04-06 22:32:24 +0200 |
---|---|---|
committer | Armin Le Grand <Armin.Le.Grand@cib.de> | 2018-04-06 22:32:24 +0200 |
commit | eba4d5b2b76cefde90cb3d6638c736f435023a45 (patch) | |
tree | 43befa620475c11f3dde00e5ea141e1efd95a334 /include/basegfx | |
parent | 6c14c27c75a03e2363f2b363ddf0a6f2f46cfa91 (diff) |
Revert "SOSAW080: Added first bunch of basic changes to helpers"
This reverts commit 6c14c27c75a03e2363f2b363ddf0a6f2f46cfa91.
Diffstat (limited to 'include/basegfx')
-rw-r--r-- | include/basegfx/matrix/b2dhommatrix.hxx | 2 | ||||
-rw-r--r-- | include/basegfx/matrix/b3dhommatrix.hxx | 3 | ||||
-rwxr-xr-x | include/basegfx/matrix/b3dhommatrixtools.hxx | 46 | ||||
-rw-r--r-- | include/basegfx/numeric/ftools.hxx | 19 | ||||
-rw-r--r-- | include/basegfx/range/b1drange.hxx | 5 | ||||
-rw-r--r-- | include/basegfx/range/b2drange.hxx | 25 | ||||
-rw-r--r-- | include/basegfx/range/b2irange.hxx | 7 | ||||
-rw-r--r-- | include/basegfx/range/b3drange.hxx | 25 | ||||
-rw-r--r-- | include/basegfx/range/basicrange.hxx | 22 |
9 files changed, 0 insertions, 154 deletions
diff --git a/include/basegfx/matrix/b2dhommatrix.hxx b/include/basegfx/matrix/b2dhommatrix.hxx index 9f2c8a338412..a7ab0c3f5917 100644 --- a/include/basegfx/matrix/b2dhommatrix.hxx +++ b/include/basegfx/matrix/b2dhommatrix.hxx @@ -74,10 +74,8 @@ namespace basegfx void rotate(double fRadiant); void translate(double fX, double fY); - void translate(const B2DTuple& rTuple); void scale(double fX, double fY); - void scale(const B2DTuple& rTuple); // Shearing-Matrices void shearX(double fSx); diff --git a/include/basegfx/matrix/b3dhommatrix.hxx b/include/basegfx/matrix/b3dhommatrix.hxx index 6d5d5c486b9b..09d700547363 100644 --- a/include/basegfx/matrix/b3dhommatrix.hxx +++ b/include/basegfx/matrix/b3dhommatrix.hxx @@ -64,15 +64,12 @@ namespace basegfx /// Rotation void rotate(double fAngleX,double fAngleY,double fAngleZ); - void rotate(const B3DTuple& rRotation); /// Translation void translate(double fX, double fY, double fZ); - void translate(const B3DTuple& rTranslation); /// Scaling void scale(double fX, double fY, double fZ); - void scale(const B3DTuple& rScale); // Shearing-Matrices void shearXY(double fSx, double fSy); diff --git a/include/basegfx/matrix/b3dhommatrixtools.hxx b/include/basegfx/matrix/b3dhommatrixtools.hxx deleted file mode 100755 index 3c5e8e83ffc2..000000000000 --- a/include/basegfx/matrix/b3dhommatrixtools.hxx +++ /dev/null @@ -1,46 +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 . - */ - -#ifndef INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIXTOOLS_HXX -#define INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIXTOOLS_HXX - -#include <sal/types.h> -#include <basegfx/matrix/b3dhommatrix.hxx> -#include <com/sun/star/drawing/HomogenMatrix.hpp> - -namespace basegfx -{ - namespace utils - { - /* tooling methods for converting API matrices (drawing::HomogenMatrix) to - B3DHomMatrix. drawing::HomogenMatrix4 is not used by OOo - */ - BASEGFX_DLLPUBLIC B3DHomMatrix UnoHomogenMatrixToB3DHomMatrix( - const com::sun::star::drawing::HomogenMatrix& rMatrixIn); - - BASEGFX_DLLPUBLIC void B3DHomMatrixToUnoHomogenMatrix( - const B3DHomMatrix& rMatrixIn, - com::sun::star::drawing::HomogenMatrix& rMatrixOut); - - } // end of namespace tools -} // end of namespace basegfx - -#endif // INCLUDED_BASEGFX_MATRIX_B3DHOMMATRIXTOOLS_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/basegfx/numeric/ftools.hxx b/include/basegfx/numeric/ftools.hxx index 1ade3bb3a3d6..52909c9cd75b 100644 --- a/include/basegfx/numeric/ftools.hxx +++ b/include/basegfx/numeric/ftools.hxx @@ -153,25 +153,6 @@ namespace basegfx */ BASEGFX_DLLPUBLIC double snapToNearestMultiple(double v, const double fStep); - /** Snap v to the range [0.0 .. fWidth] using modulo - */ - double snapToZeroRange(double v, double fWidth); - - /** Snap v to the range [fLow .. fHigh] using modulo - */ - double snapToRange(double v, double fLow, double fHigh); - - /** return fValue with the sign of fSignCarrier, thus evtl. changed - */ - inline double copySign(double fValue, double fSignCarrier) - { -#ifdef WNT - return _copysign(fValue, fSignCarrier); -#else - return copysign(fValue, fSignCarrier); -#endif - } - /** RotateFlyFrame3: Normalize to range defined by [0.0 ... fRange[, independent if v is positive or negative. diff --git a/include/basegfx/range/b1drange.hxx b/include/basegfx/range/b1drange.hxx index 7b0d22869559..c1e35b13605c 100644 --- a/include/basegfx/range/b1drange.hxx +++ b/include/basegfx/range/b1drange.hxx @@ -141,11 +141,6 @@ namespace basegfx maRange.intersect(rRange.maRange); } - /// clamp value on range - double clamp(double fValue) const - { - return maRange.clamp(fValue); - } }; } // end of namespace basegfx diff --git a/include/basegfx/range/b2drange.hxx b/include/basegfx/range/b2drange.hxx index 00eab63d1472..0de9dba0e783 100644 --- a/include/basegfx/range/b2drange.hxx +++ b/include/basegfx/range/b2drange.hxx @@ -274,29 +274,8 @@ namespace basegfx maRangeY.grow(fValue); } - /// clamp value on range - B2DTuple clamp(const B2DTuple& rTuple) const - { - return B2DTuple( - maRangeX.clamp(rTuple.getX()), - maRangeY.clamp(rTuple.getY())); - } - - /** Transform Range by given transformation matrix. */ BASEGFX_DLLPUBLIC void transform(const B2DHomMatrix& rMatrix); - /** Transform Range by given transformation matrix. - - This operation transforms the Range by transforming all four possible - extrema points (corners) of the given range and building a new one. - This means that the range will grow evtl. when a shear and/or rotation - is part of the transformation. - */ - B2DRange& operator*=( const ::basegfx::B2DHomMatrix& rMat ); - - /** Get a range filled with (0.0, 0.0, 1.0, 1.0) */ - static const B2DRange& getUnitB2DRange(); - private: typedef ::basegfx::BasicRange< ValueType, TraitsType > MyBasicRange; @@ -304,10 +283,6 @@ namespace basegfx MyBasicRange maRangeY; }; - /** Transform B2DRange by given transformation matrix (see operator*=()) - */ - B2DRange operator*( const B2DHomMatrix& rMat, const B2DRange& rB2DRange ); - /** Round double to nearest integer for 2D range @return the nearest integer for this range diff --git a/include/basegfx/range/b2irange.hxx b/include/basegfx/range/b2irange.hxx index a8a95d69ceed..3d7d0edba6c9 100644 --- a/include/basegfx/range/b2irange.hxx +++ b/include/basegfx/range/b2irange.hxx @@ -208,13 +208,6 @@ namespace basegfx maRangeY.intersect(rRange.maRangeY); } - B2ITuple clamp(const B2ITuple& rTuple) const - { - return B2ITuple( - maRangeX.clamp(rTuple.getX()), - maRangeY.clamp(rTuple.getY())); - } - private: typedef ::basegfx::BasicRange< ValueType, TraitsType > MyBasicRange; diff --git a/include/basegfx/range/b3drange.hxx b/include/basegfx/range/b3drange.hxx index e1c44393813a..881dce612297 100644 --- a/include/basegfx/range/b3drange.hxx +++ b/include/basegfx/range/b3drange.hxx @@ -195,34 +195,9 @@ namespace basegfx maRangeZ.grow(fValue); } - /// clamp value on range - B3DTuple clamp(const B3DTuple& rTuple) const - { - return B3DTuple( - maRangeX.clamp(rTuple.getX()), - maRangeY.clamp(rTuple.getY()), - maRangeZ.clamp(rTuple.getZ())); - } - BASEGFX_DLLPUBLIC void transform(const B3DHomMatrix& rMatrix); - - /** Transform Range by given transformation matrix. - - This operation transforms the Range by transforming all eight possible - extrema points (corners) of the given range and building a new one. - This means that the range will grow evtl. when a shear and/or rotation - is part of the transformation. - */ - B3DRange& operator*=( const ::basegfx::B3DHomMatrix& rMat ); - - /** Get a range filled with (0.0, 0.0, 0.0, 1.0, 1.0, 1.0) */ - static const B3DRange& getUnitB3DRange(); }; - /** Transform B3DRange by given transformation matrix (see operator*=()) - */ - B3DRange operator*( const B3DHomMatrix& rMat, const B3DRange& rB2DRange ); - } // end of namespace basegfx diff --git a/include/basegfx/range/basicrange.hxx b/include/basegfx/range/basicrange.hxx index 17f31ea42f19..bea40dd3ded2 100644 --- a/include/basegfx/range/basicrange.hxx +++ b/include/basegfx/range/basicrange.hxx @@ -248,28 +248,6 @@ namespace basegfx } } - T clamp(T nValue) const - { - if(isEmpty()) - { - return nValue; - } - else - { - if(nValue < mnMinimum) - { - return mnMinimum; - } - - if(nValue > mnMaximum) - { - return mnMaximum; - } - - return nValue; - } - } - typename Traits::DifferenceType getRange() const { if(isEmpty()) |