[Libreoffice-commits] core.git: basegfx/source include/basegfx
Zsolt Bölöny
bolony.zsolt at gmail.com
Wed May 27 06:46:13 PDT 2015
basegfx/source/range/b3drange.cxx | 1
include/basegfx/range/b3drange.hxx | 1
include/basegfx/range/b3irange.hxx | 230 -------------------------------------
3 files changed, 232 deletions(-)
New commits:
commit 135ced89b2fd2de02aec2132783543242197d945
Author: Zsolt Bölöny <bolony.zsolt at gmail.com>
Date: Tue May 19 00:16:44 2015 +0200
Remove B3IRange, it's not used anywhere
Change-Id: I19a6835eaab2efba530d30f871f1b4509b683801
Reviewed-on: https://gerrit.libreoffice.org/15812
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basegfx/source/range/b3drange.cxx b/basegfx/source/range/b3drange.cxx
index b07fcb5..f779f18 100644
--- a/basegfx/source/range/b3drange.cxx
+++ b/basegfx/source/range/b3drange.cxx
@@ -18,7 +18,6 @@
*/
#include <basegfx/range/b3drange.hxx>
-#include <basegfx/range/b3irange.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
diff --git a/include/basegfx/range/b3drange.hxx b/include/basegfx/range/b3drange.hxx
index cf96c16..3ce6925 100644
--- a/include/basegfx/range/b3drange.hxx
+++ b/include/basegfx/range/b3drange.hxx
@@ -28,7 +28,6 @@
namespace basegfx
{
- class B3IRange;
class B3DHomMatrix;
class B3DRange
diff --git a/include/basegfx/range/b3irange.hxx b/include/basegfx/range/b3irange.hxx
deleted file mode 100644
index 5a51571..0000000
--- a/include/basegfx/range/b3irange.hxx
+++ /dev/null
@@ -1,230 +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_RANGE_B3IRANGE_HXX
-#define INCLUDED_BASEGFX_RANGE_B3IRANGE_HXX
-
-#include <basegfx/point/b3ipoint.hxx>
-#include <basegfx/point/b3dpoint.hxx>
-#include <basegfx/tuple/b3ituple.hxx>
-#include <basegfx/range/basicrange.hxx>
-#include <basegfx/basegfxdllapi.h>
-
-namespace basegfx
-{
- class B3IRange
- {
- typedef ::basegfx::BasicRange< sal_Int32, Int32Traits > MyBasicRange;
-
- MyBasicRange maRangeX;
- MyBasicRange maRangeY;
- MyBasicRange maRangeZ;
-
- public:
- B3IRange() {}
-
- explicit B3IRange(const B3ITuple& rTuple)
- : maRangeX(rTuple.getX()),
- maRangeY(rTuple.getY()),
- maRangeZ(rTuple.getZ())
- {
- }
-
- B3IRange(sal_Int32 x1,
- sal_Int32 y1,
- sal_Int32 z1,
- sal_Int32 x2,
- sal_Int32 y2,
- sal_Int32 z2)
- : maRangeX(x1),
- maRangeY(y1),
- maRangeZ(z1)
- {
- maRangeX.expand(x2);
- maRangeY.expand(y2);
- maRangeZ.expand(z2);
- }
-
- B3IRange(const B3ITuple& rTuple1,
- const B3ITuple& rTuple2)
- : maRangeX(rTuple1.getX()),
- maRangeY(rTuple1.getY()),
- maRangeZ(rTuple1.getZ())
- {
- expand(rTuple2);
- }
-
- bool isEmpty() const
- {
- return maRangeX.isEmpty() || maRangeY.isEmpty() || maRangeZ.isEmpty();
- }
-
- void reset()
- {
- maRangeX.reset();
- maRangeY.reset();
- maRangeZ.reset();
- }
-
- bool operator==( const B3IRange& rRange ) const
- {
- return (maRangeX == rRange.maRangeX
- && maRangeY == rRange.maRangeY
- && maRangeZ == rRange.maRangeZ);
- }
-
- bool operator!=( const B3IRange& rRange ) const
- {
- return (maRangeX != rRange.maRangeX
- || maRangeY != rRange.maRangeY
- || maRangeZ != rRange.maRangeZ);
- }
-
- sal_Int32 getMinX() const
- {
- return maRangeX.getMinimum();
- }
-
- sal_Int32 getMinY() const
- {
- return maRangeY.getMinimum();
- }
-
- sal_Int32 getMinZ() const
- {
- return maRangeZ.getMinimum();
- }
-
- sal_Int32 getMaxX() const
- {
- return maRangeX.getMaximum();
- }
-
- sal_Int32 getMaxY() const
- {
- return maRangeY.getMaximum();
- }
-
- sal_Int32 getMaxZ() const
- {
- return maRangeZ.getMaximum();
- }
-
- sal_Int64 getWidth() const
- {
- return maRangeX.getRange();
- }
-
- sal_Int64 getHeight() const
- {
- return maRangeY.getRange();
- }
-
- sal_Int64 getDepth() const
- {
- return maRangeZ.getRange();
- }
-
- B3IPoint getMinimum() const
- {
- return B3IPoint(
- maRangeX.getMinimum(),
- maRangeY.getMinimum(),
- maRangeZ.getMinimum()
- );
- }
-
- B3IPoint getMaximum() const
- {
- return B3IPoint(
- maRangeX.getMaximum(),
- maRangeY.getMaximum(),
- maRangeZ.getMaximum()
- );
- }
-
- B3DPoint getCenter() const
- {
- return B3DPoint(
- maRangeX.getCenter(),
- maRangeY.getCenter(),
- maRangeZ.getCenter()
- );
- }
-
- bool isInside(const B3ITuple& rTuple) const
- {
- return (
- maRangeX.isInside(rTuple.getX())
- && maRangeY.isInside(rTuple.getY())
- && maRangeZ.isInside(rTuple.getZ())
- );
- }
-
- bool isInside(const B3IRange& rRange) const
- {
- return (
- maRangeX.isInside(rRange.maRangeX)
- && maRangeY.isInside(rRange.maRangeY)
- && maRangeZ.isInside(rRange.maRangeZ)
- );
- }
-
- bool overlaps(const B3IRange& rRange) const
- {
- return (
- maRangeX.overlaps(rRange.maRangeX)
- && maRangeY.overlaps(rRange.maRangeY)
- && maRangeZ.overlaps(rRange.maRangeZ)
- );
- }
-
- void expand(const B3ITuple& rTuple)
- {
- maRangeX.expand(rTuple.getX());
- maRangeY.expand(rTuple.getY());
- maRangeZ.expand(rTuple.getZ());
- }
-
- void expand(const B3IRange& rRange)
- {
- maRangeX.expand(rRange.maRangeX);
- maRangeY.expand(rRange.maRangeY);
- maRangeZ.expand(rRange.maRangeZ);
- }
-
- void intersect(const B3IRange& rRange)
- {
- maRangeX.intersect(rRange.maRangeX);
- maRangeY.intersect(rRange.maRangeY);
- maRangeZ.intersect(rRange.maRangeZ);
- }
-
- void grow(sal_Int32 nValue)
- {
- maRangeX.grow(nValue);
- maRangeY.grow(nValue);
- maRangeZ.grow(nValue);
- }
- };
-} // end of namespace basegfx
-
-#endif // INCLUDED_BASEGFX_RANGE_B3IRANGE_HXX
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list