[Libreoffice-commits] core.git: basegfx/Library_basegfx.mk basegfx/source include/basegfx
Zsolt Bölöny
bolony.zsolt at gmail.com
Wed May 27 07:44:35 PDT 2015
basegfx/Library_basegfx.mk | 1
basegfx/source/point/b3ipoint.cxx | 69 -------------------
include/basegfx/point/b3ipoint.hxx | 128 -------------------------------------
3 files changed, 198 deletions(-)
New commits:
commit bda06661d863e588eed57ce34bf03d58b0d52b6a
Author: Zsolt Bölöny <bolony.zsolt at gmail.com>
Date: Tue May 19 00:20:56 2015 +0200
Remove B3IPoint, it's not used anywhere
Change-Id: I7031c126179bbceebc40dcbdab5a0570db5bc29f
Reviewed-on: https://gerrit.libreoffice.org/15813
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 974d3b3..68cfe1c 100644
--- a/basegfx/Library_basegfx.mk
+++ b/basegfx/Library_basegfx.mk
@@ -44,7 +44,6 @@ $(eval $(call gb_Library_add_exception_objects,basegfx,\
basegfx/source/point/b2dpoint \
basegfx/source/point/b2ipoint \
basegfx/source/point/b3dpoint \
- basegfx/source/point/b3ipoint \
basegfx/source/polygon/b2dlinegeometry \
basegfx/source/polygon/b2dpolygon \
basegfx/source/polygon/b2dpolygonclipper \
diff --git a/basegfx/source/point/b3ipoint.cxx b/basegfx/source/point/b3ipoint.cxx
deleted file mode 100644
index 7b50b20..0000000
--- a/basegfx/source/point/b3ipoint.cxx
+++ /dev/null
@@ -1,69 +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/point/b3ipoint.hxx>
-#include <basegfx/matrix/b3dhommatrix.hxx>
-#include <basegfx/numeric/ftools.hxx>
-
-namespace basegfx
-{
- B3IPoint& B3IPoint::operator*=( const ::basegfx::B3DHomMatrix& rMat )
- {
- double fTempX(
- rMat.get(0, 0) * mnX +
- rMat.get(0, 1) * mnY +
- rMat.get(0, 2) * mnZ +
- rMat.get(0, 3));
- double fTempY(
- rMat.get(1, 0) * mnX +
- rMat.get(1, 1) * mnY +
- rMat.get(1, 2) * mnZ +
- rMat.get(1, 3));
- double fTempZ(
- rMat.get(2, 0) * mnX +
- rMat.get(2, 1) * mnY +
- rMat.get(2, 2) * mnZ +
- rMat.get(2, 3));
-
- if(!rMat.isLastLineDefault())
- {
- const double fOne(1.0);
- const double fTempM(
- rMat.get(3, 0) * mnX +
- rMat.get(3, 1) * mnY +
- rMat.get(3, 2) * mnZ +
- rMat.get(3, 3));
-
- if(!fTools::equalZero(fTempM) && !fTools::equal(fOne, fTempM))
- {
- fTempX /= fTempM;
- fTempY /= fTempM;
- fTempZ /= fTempM;
- }
- }
-
- mnX = fround(fTempX);
- mnY = fround(fTempY);
- mnZ = fround(fTempZ);
-
- return *this;
- }
-} // end of namespace basegfx
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/basegfx/point/b3ipoint.hxx b/include/basegfx/point/b3ipoint.hxx
deleted file mode 100644
index dcd2906..0000000
--- a/include/basegfx/point/b3ipoint.hxx
+++ /dev/null
@@ -1,128 +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_POINT_B3IPOINT_HXX
-#define INCLUDED_BASEGFX_POINT_B3IPOINT_HXX
-
-#include <basegfx/tuple/b3ituple.hxx>
-#include <basegfx/basegfxdllapi.h>
-
-namespace basegfx
-{
- class B3DHomMatrix;
-
- /** Base Point class with three sal_Int32 values
-
- This class derives all operators and common handling for
- a 3D data class from B3ITuple. All necessary extensions
- which are special for points will be added here.
-
- @see B3ITuple
- */
- class BASEGFX_DLLPUBLIC SAL_WARN_UNUSED B3IPoint : public ::basegfx::B3ITuple
- {
- public:
- /** Create a 3D Point
-
- The point is initialized to (0, 0, 0)
- */
- B3IPoint()
- : B3ITuple()
- {}
-
- /** Create a 3D Point
-
- @param nX
- This parameter is used to initialize the X-coordinate
- of the 3D Point.
-
- @param nY
- This parameter is used to initialize the Y-coordinate
- of the 3D Point.
-
- @param nZ
- This parameter is used to initialize the Z-coordinate
- of the 3D Point.
- */
- B3IPoint(sal_Int32 nX, sal_Int32 nY, sal_Int32 nZ)
- : B3ITuple(nX, nY, nZ)
- {}
-
- /** Create a copy of a 3D Point
-
- @param rVec
- The 3D Point which will be copied.
- */
- B3IPoint(const B3IPoint& rVec)
- : B3ITuple(rVec)
- {}
-
- /** constructor with tuple to allow copy-constructing
- from B3ITuple-based classes
- */
- B3IPoint(const ::basegfx::B3ITuple& rTuple)
- : B3ITuple(rTuple)
- {}
-
- ~B3IPoint()
- {}
-
- /** *=operator to allow usage from B3IPoint, too
- */
- B3IPoint& operator*=( const B3IPoint& rPnt )
- {
- mnX *= rPnt.mnX;
- mnY *= rPnt.mnY;
- mnZ *= rPnt.mnZ;
- return *this;
- }
-
- /** *=operator to allow usage from B3IPoint, too
- */
- B3IPoint& operator*=(sal_Int32 t)
- {
- mnX *= t;
- mnY *= t;
- mnZ *= t;
- return *this;
- }
-
- /** assignment operator to allow assigning the results
- of B3ITuple calculations
- */
- B3IPoint& operator=( const ::basegfx::B3ITuple& rVec )
- {
- mnX = rVec.getX();
- mnY = rVec.getY();
- mnZ = rVec.getZ();
- return *this;
- }
-
- /** Transform point by given transformation matrix.
-
- The translational components of the matrix are, in
- contrast to B3DVector, applied.
- */
- B3IPoint& operator*=( const ::basegfx::B3DHomMatrix& rMat );
- };
-} // end of namespace basegfx
-
-#endif // INCLUDED_BASEGFX_POINT_B3IPOINT_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list