diff options
| author | Tor Lillqvist <tml@collabora.com> | 2017-09-22 14:12:07 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2017-09-26 14:18:41 +0200 |
| commit | 8e7897588d7185ef1964e8120669c1de3d1ce734 (patch) | |
| tree | 8f48598670a5dc22703371943c05789d60b9a07d /basegfx/source/polygon/b2dpolygontriangulator.cxx | |
| parent | loplugin:flatten in sw (diff) | |
| download | core-8e7897588d7185ef1964e8120669c1de3d1ce734.tar.gz core-8e7897588d7185ef1964e8120669c1de3d1ce734.zip | |
Rename the basegfx::tools namespace to basegfx::utils
Reduce potential confusion with the global tools namespace. Will
hopefully make it possible to remove the annoying initial :: when
referring to the global tools namespace. Unless we have even more
tools subnamespaces somewhere.
Thorsten said it was OK.
Change-Id: Id088dfe8f4244cb79df9aa988995b31a1758c996
Reviewed-on: https://gerrit.libreoffice.org/42644
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'basegfx/source/polygon/b2dpolygontriangulator.cxx')
| -rw-r--r-- | basegfx/source/polygon/b2dpolygontriangulator.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/basegfx/source/polygon/b2dpolygontriangulator.cxx b/basegfx/source/polygon/b2dpolygontriangulator.cxx index 4a85547d7de3..8cd4f895b14a 100644 --- a/basegfx/source/polygon/b2dpolygontriangulator.cxx +++ b/basegfx/source/polygon/b2dpolygontriangulator.cxx @@ -181,7 +181,7 @@ namespace basegfx bool Triangulator::CheckPointInTriangle(EdgeEntry* pEdgeA, EdgeEntry const * pEdgeB, const B2DPoint& rTestPoint) { // inside triangle or on edge? - if(tools::isPointInTriangle(pEdgeA->getStart(), pEdgeA->getEnd(), pEdgeB->getEnd(), rTestPoint, true)) + if(utils::isPointInTriangle(pEdgeA->getStart(), pEdgeA->getEnd(), pEdgeB->getEnd(), rTestPoint, true)) { // but not on point if(!rTestPoint.equal(pEdgeA->getEnd()) && !rTestPoint.equal(pEdgeB->getEnd())) @@ -387,9 +387,9 @@ namespace basegfx B2DPolygon aRetval; // subdivide locally (triangulate does not work with beziers), remove double and neutral points - B2DPolygon aCandidate(rCandidate.areControlPointsUsed() ? tools::adaptiveSubdivideByAngle(rCandidate) : rCandidate); + B2DPolygon aCandidate(rCandidate.areControlPointsUsed() ? utils::adaptiveSubdivideByAngle(rCandidate) : rCandidate); aCandidate.removeDoublePoints(); - aCandidate = tools::removeNeutralPoints(aCandidate); + aCandidate = utils::removeNeutralPoints(aCandidate); if(aCandidate.count() == 2) { @@ -398,10 +398,10 @@ namespace basegfx } else if(aCandidate.count() > 2) { - if(tools::isConvex(aCandidate)) + if(utils::isConvex(aCandidate)) { // polygon is convex, just use a triangle fan - tools::addTriangleFan(aCandidate, aRetval); + utils::addTriangleFan(aCandidate, aRetval); } else { @@ -420,7 +420,7 @@ namespace basegfx B2DPolygon aRetval; // subdivide locally (triangulate does not work with beziers) - B2DPolyPolygon aCandidate(rCandidate.areControlPointsUsed() ? tools::adaptiveSubdivideByAngle(rCandidate) : rCandidate); + B2DPolyPolygon aCandidate(rCandidate.areControlPointsUsed() ? utils::adaptiveSubdivideByAngle(rCandidate) : rCandidate); if(aCandidate.count() == 1) { |