[Libreoffice-commits] core.git: basegfx/Library_basegfx.mk basegfx/source include/basegfx
Zsolt Bölöny
bolony.zsolt at gmail.com
Tue May 26 01:45:28 PDT 2015
basegfx/Library_basegfx.mk | 1
basegfx/source/tuple/b3i64tuple.cxx | 29 --
include/basegfx/range/b3irange.hxx | 10 -
include/basegfx/tuple/b3i64tuple.hxx | 346 -----------------------------------
4 files changed, 386 deletions(-)
New commits:
commit 19fc914aa6ab19890abf0e25712049e3ff9957ae
Author: Zsolt Bölöny <bolony.zsolt at gmail.com>
Date: Tue May 19 00:00:46 2015 +0200
Remove B3I64Tuple, it's not used by anything
Change-Id: Ie1b05375a8e8d634e6ef6b2bf6edde65b32574bd
Reviewed-on: https://gerrit.libreoffice.org/15811
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basegfx/Library_basegfx.mk b/basegfx/Library_basegfx.mk
index ac5878a..0c1ff0f 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/tuple/b2i64tuple \
basegfx/source/tuple/b2ituple \
basegfx/source/tuple/b3dtuple \
- basegfx/source/tuple/b3i64tuple \
basegfx/source/tuple/b3ituple \
basegfx/source/vector/b2dvector \
basegfx/source/vector/b2ivector \
diff --git a/basegfx/source/tuple/b3i64tuple.cxx b/basegfx/source/tuple/b3i64tuple.cxx
deleted file mode 100644
index ac7c879..0000000
--- a/basegfx/source/tuple/b3i64tuple.cxx
+++ /dev/null
@@ -1,29 +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 <basegfx/tuple/b3i64tuple.hxx>
-#include <rtl/instance.hxx>
-
-namespace { struct EmptyTuple : public rtl::Static<basegfx::B3I64Tuple, EmptyTuple> {}; }
-
-namespace basegfx
-{
-} // end of namespace basegfx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/range/b3irange.hxx b/include/basegfx/range/b3irange.hxx
index 4d3f0c7..5a51571 100644
--- a/include/basegfx/range/b3irange.hxx
+++ b/include/basegfx/range/b3irange.hxx
@@ -23,7 +23,6 @@
#include <basegfx/point/b3ipoint.hxx>
#include <basegfx/point/b3dpoint.hxx>
#include <basegfx/tuple/b3ituple.hxx>
-#include <basegfx/tuple/b3i64tuple.hxx>
#include <basegfx/range/basicrange.hxx>
#include <basegfx/basegfxdllapi.h>
@@ -160,15 +159,6 @@ namespace basegfx
);
}
- B3I64Tuple getRange() const
- {
- return B3I64Tuple(
- maRangeX.getRange(),
- maRangeY.getRange(),
- maRangeZ.getRange()
- );
- }
-
B3DPoint getCenter() const
{
return B3DPoint(
diff --git a/include/basegfx/tuple/b3i64tuple.hxx b/include/basegfx/tuple/b3i64tuple.hxx
deleted file mode 100644
index 6875ae9..0000000
--- a/include/basegfx/tuple/b3i64tuple.hxx
+++ /dev/null
@@ -1,346 +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_TUPLE_B3I64TUPLE_HXX
-#define INCLUDED_BASEGFX_TUPLE_B3I64TUPLE_HXX
-
-#include <sal/types.h>
-#include <basegfx/tuple/b3dtuple.hxx>
-#include <basegfx/basegfxdllapi.h>
-
-
-namespace basegfx
-{
- /** Base class for all Points/Vectors with three sal_Int64 values
-
- This class provides all methods common to Point
- avd Vector classes which are derived from here.
-
- @derive Use this class to implement Points or Vectors
- which are based on three sal_Int64 values
- */
- class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED B3I64Tuple
- {
- protected:
- sal_Int64 mnX;
- sal_Int64 mnY;
- sal_Int64 mnZ;
-
- public:
- /** Create a 3D Tuple
-
- The tuple is initialized to (0, 0, 0)
- */
- B3I64Tuple()
- : mnX(0),
- mnY(0),
- mnZ(0)
- {}
-
- /** Create a 3D Tuple
-
- @param nX
- This parameter is used to initialize the X-coordinate
- of the 3D Tuple.
-
- @param nY
- This parameter is used to initialize the Y-coordinate
- of the 3D Tuple.
-
- @param nZ
- This parameter is used to initialize the Z-coordinate
- of the 3D Tuple.
- */
- B3I64Tuple(sal_Int64 nX, sal_Int64 nY, sal_Int64 nZ)
- : mnX(nX),
- mnY(nY),
- mnZ(nZ)
- {}
-
- /** Create a copy of a 3D Tuple
-
- @param rTup
- The 3D Tuple which will be copied.
- */
- B3I64Tuple(const B3I64Tuple& rTup)
- : mnX( rTup.mnX ),
- mnY( rTup.mnY ),
- mnZ( rTup.mnZ )
- {}
-
- ~B3I64Tuple()
- {}
-
- /// get X-Coordinate of 3D Tuple
- sal_Int64 getX() const
- {
- return mnX;
- }
-
- /// get Y-Coordinate of 3D Tuple
- sal_Int64 getY() const
- {
- return mnY;
- }
-
- /// get Z-Coordinate of 3D Tuple
- sal_Int64 getZ() const
- {
- return mnZ;
- }
-
- /// set X-Coordinate of 3D Tuple
- void setX(sal_Int64 nX)
- {
- mnX = nX;
- }
-
- /// set Y-Coordinate of 3D Tuple
- void setY(sal_Int64 nY)
- {
- mnY = nY;
- }
-
- /// set Z-Coordinate of 3D Tuple
- void setZ(sal_Int64 nZ)
- {
- mnZ = nZ;
- }
-
- /// Array-access to 3D Tuple
- const sal_Int64& operator[] (int nPos) const
- {
- // Here, normally two if(...)'s should be used. In the assumption that
- // both sal_Int64 members can be accessed as an array a shortcut is used here.
- // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
- return *((&mnX) + nPos);
- }
-
- /// Array-access to 3D Tuple
- sal_Int64& operator[] (int nPos)
- {
- // Here, normally two if(...)'s should be used. In the assumption that
- // both sal_Int64 members can be accessed as an array a shortcut is used here.
- // if(0 == nPos) return mnX; if(1 == nPos) return mnY; return mnZ;
- return *((&mnX) + nPos);
- }
-
- // operators
-
-
- B3I64Tuple& operator+=( const B3I64Tuple& rTup )
- {
- mnX += rTup.mnX;
- mnY += rTup.mnY;
- mnZ += rTup.mnZ;
- return *this;
- }
-
- B3I64Tuple& operator-=( const B3I64Tuple& rTup )
- {
- mnX -= rTup.mnX;
- mnY -= rTup.mnY;
- mnZ -= rTup.mnZ;
- return *this;
- }
-
- B3I64Tuple& operator/=( const B3I64Tuple& rTup )
- {
- mnX /= rTup.mnX;
- mnY /= rTup.mnY;
- mnZ /= rTup.mnZ;
- return *this;
- }
-
- B3I64Tuple& operator*=( const B3I64Tuple& rTup )
- {
- mnX *= rTup.mnX;
- mnY *= rTup.mnY;
- mnZ *= rTup.mnZ;
- return *this;
- }
-
- B3I64Tuple& operator*=(sal_Int64 t)
- {
- mnX *= t;
- mnY *= t;
- mnZ *= t;
- return *this;
- }
-
- B3I64Tuple& operator/=(sal_Int64 t)
- {
- mnX /= t;
- mnY /= t;
- mnZ /= t;
- return *this;
- }
-
- B3I64Tuple operator-(void) const
- {
- return B3I64Tuple(-mnX, -mnY, -mnZ);
- }
-
- bool operator==( const B3I64Tuple& rTup ) const
- {
- return this == &rTup || (rTup.mnX == mnX && rTup.mnY == mnY && rTup.mnZ == mnZ);
- }
-
- bool operator!=( const B3I64Tuple& rTup ) const
- {
- return !(*this == rTup);
- }
-
- B3I64Tuple& operator=( const B3I64Tuple& rTup )
- {
- mnX = rTup.mnX;
- mnY = rTup.mnY;
- mnZ = rTup.mnZ;
- return *this;
- }
- };
-
- // external operators
-
-
- inline B3I64Tuple minimum(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
- {
- return B3I64Tuple(
- std::min(rTupB.getX(), rTupA.getX()),
- std::min(rTupB.getY(), rTupA.getY()),
- std::min(rTupB.getZ(), rTupA.getZ()));
- }
-
- inline B3I64Tuple maximum(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
- {
- return B3I64Tuple(
- std::max(rTupB.getX(), rTupA.getX()),
- std::max(rTupB.getY(), rTupA.getY()),
- std::max(rTupB.getZ(), rTupA.getZ()));
- }
-
- inline B3I64Tuple absolute(const B3I64Tuple& rTup)
- {
- B3I64Tuple aAbs(
- (0 > rTup.getX()) ? -rTup.getX() : rTup.getX(),
- (0 > rTup.getY()) ? -rTup.getY() : rTup.getY(),
- (0 > rTup.getZ()) ? -rTup.getZ() : rTup.getZ());
- return aAbs;
- }
-
- inline B3I64Tuple interpolate(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2, double t)
- {
- if(rOld1 == rOld2)
- {
- return rOld1;
- }
- else if(0.0 >= t)
- {
- return rOld1;
- }
- else if(1.0 <= t)
- {
- return rOld2;
- }
- else
- {
- return B3I64Tuple(
- basegfx::fround64(((rOld2.getX() - rOld1.getX()) * t) + rOld1.getX()),
- basegfx::fround64(((rOld2.getY() - rOld1.getY()) * t) + rOld1.getY()),
- basegfx::fround64(((rOld2.getZ() - rOld1.getZ()) * t) + rOld1.getZ()));
- }
- }
-
- inline B3I64Tuple average(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2)
- {
- return B3I64Tuple(
- rOld1.getX() == rOld2.getX() ? rOld1.getX() : basegfx::fround64((rOld1.getX() + rOld2.getX()) * 0.5),
- rOld1.getY() == rOld2.getY() ? rOld1.getY() : basegfx::fround64((rOld1.getY() + rOld2.getY()) * 0.5),
- rOld1.getZ() == rOld2.getZ() ? rOld1.getZ() : basegfx::fround64((rOld1.getZ() + rOld2.getZ()) * 0.5));
- }
-
- inline B3I64Tuple average(const B3I64Tuple& rOld1, const B3I64Tuple& rOld2, const B3I64Tuple& rOld3)
- {
- return B3I64Tuple(
- (rOld1.getX() == rOld2.getX() && rOld2.getX() == rOld3.getX()) ? rOld1.getX() : basegfx::fround64((rOld1.getX() + rOld2.getX() + rOld3.getX()) * (1.0 / 3.0)),
- (rOld1.getY() == rOld2.getY() && rOld2.getY() == rOld3.getY()) ? rOld1.getY() : basegfx::fround64((rOld1.getY() + rOld2.getY() + rOld3.getY()) * (1.0 / 3.0)),
- (rOld1.getZ() == rOld2.getZ() && rOld2.getZ() == rOld3.getZ()) ? rOld1.getZ() : basegfx::fround64((rOld1.getZ() + rOld2.getZ() + rOld3.getZ()) * (1.0 / 3.0)));
- }
-
- inline B3I64Tuple operator+(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
- {
- B3I64Tuple aSum(rTupA);
- aSum += rTupB;
- return aSum;
- }
-
- inline B3I64Tuple operator-(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
- {
- B3I64Tuple aSub(rTupA);
- aSub -= rTupB;
- return aSub;
- }
-
- inline B3I64Tuple operator/(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
- {
- B3I64Tuple aDiv(rTupA);
- aDiv /= rTupB;
- return aDiv;
- }
-
- inline B3I64Tuple operator*(const B3I64Tuple& rTupA, const B3I64Tuple& rTupB)
- {
- B3I64Tuple aMul(rTupA);
- aMul *= rTupB;
- return aMul;
- }
-
- inline B3I64Tuple operator*(const B3I64Tuple& rTup, sal_Int64 t)
- {
- B3I64Tuple aNew(rTup);
- aNew *= t;
- return aNew;
- }
-
- inline B3I64Tuple operator*(sal_Int64 t, const B3I64Tuple& rTup)
- {
- B3I64Tuple aNew(rTup);
- aNew *= t;
- return aNew;
- }
-
- inline B3I64Tuple operator/(const B3I64Tuple& rTup, sal_Int64 t)
- {
- B3I64Tuple aNew(rTup);
- aNew /= t;
- return aNew;
- }
-
- inline B3I64Tuple operator/(sal_Int64 t, const B3I64Tuple& rTup)
- {
- B3I64Tuple aNew(t, t, t);
- B3I64Tuple aTmp(rTup);
- aNew /= aTmp;
- return aNew;
- }
-} // end of namespace basegfx
-
-#endif // INCLUDED_BASEGFX_TUPLE_B3I64TUPLE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list