diff options
Diffstat (limited to 'generator/tesselator.cpp')
| -rw-r--r-- | generator/tesselator.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/generator/tesselator.cpp b/generator/tesselator.cpp index 68b132d7b0..7667e1ccd4 100644 --- a/generator/tesselator.cpp +++ b/generator/tesselator.cpp @@ -9,9 +9,9 @@ #include "base/assert.hpp" #include "base/logging.hpp" -#include "std/limits.hpp" -#include "std/queue.hpp" -#include "std/unique_ptr.hpp" +#include <limits> +#include <memory> +#include <queue> #include "3party/libtess2/Include/tesselator.h" @@ -24,7 +24,7 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) int constexpr kVerticesInPolygon = 3; auto const deleter = [](TESStesselator * tess) {tessDeleteTess(tess);}; - unique_ptr<TESStesselator, decltype(deleter)> tess(tessNewTess(nullptr), deleter); + std::unique_ptr<TESStesselator, decltype(deleter)> tess(tessNewTess(nullptr), deleter); for (auto const & contour : polys) { @@ -65,7 +65,7 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) void TrianglesInfo::ListInfo::AddNeighbour(int p1, int p2, int trg) { // find or insert element for key - pair<TNeighbours::iterator, bool> ret = m_neighbors.insert(make_pair(make_pair(p1, p2), trg)); + std::pair<TNeighbours::iterator, bool> ret = m_neighbors.insert(std::make_pair(std::make_pair(p1, p2), trg)); // triangles should not duplicate CHECK ( ret.second, ("Duplicating triangles for indices : ", p1, p2) ); @@ -83,8 +83,8 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) template <class IterT> size_t GetBufferSize(IterT b, IterT e) { - vector<char> buffer; - MemWriter<vector<char> > writer(buffer); + std::vector<char> buffer; + MemWriter<std::vector<char> > writer(buffer); while (b != e) WriteVarUint(writer, *b++); return buffer.size(); } @@ -94,12 +94,12 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) TrianglesInfo::ListInfo::FindStartTriangle(PointsInfo const & points) const { TIterator ret = m_neighbors.end(); - size_t cr = numeric_limits<size_t>::max(); + size_t cr = std::numeric_limits<size_t>::max(); for (TIterator i = m_neighbors.begin(); i != m_neighbors.end(); ++i) { if (!m_visited[i->second] && - m_neighbors.find(make_pair(i->first.second, i->first.first)) == m_neighbors.end()) + m_neighbors.find(std::make_pair(i->first.second, i->first.first)) == m_neighbors.end()) { uint64_t deltas[3]; deltas[0] = EncodeDelta(points.m_points[i->first.first], points.m_base); @@ -121,19 +121,19 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) } /// Return indexes of common edges of [to, from] triangles. - pair<int, int> CommonEdge(Triangle const & to, Triangle const & from) + std::pair<int, int> CommonEdge(Triangle const & to, Triangle const & from) { for (int i = 0; i < 3; ++i) { for (int j = 0; j < 3; ++j) { if (to.m_p[i] == from.m_p[my::NextModN(j, 3)] && to.m_p[my::NextModN(i, 3)] == from.m_p[j]) - return make_pair(i, j); + return std::make_pair(i, j); } } ASSERT ( false, ("?WTF? Triangles not neighbors!") ); - return make_pair(-1, -1); + return std::make_pair(-1, -1); } /// Get neighbors of 'trg' triangle, which was achieved from 'from' triangle. @@ -147,10 +147,10 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) int j = my::NextModN(i, 3); int ind = 0; - TIterator it = m_neighbors.find(make_pair(trg.m_p[j], trg.m_p[i])); + TIterator it = m_neighbors.find(std::make_pair(trg.m_p[j], trg.m_p[i])); nb[ind++] = (it != m_neighbors.end()) ? it->second : empty_key; - it = m_neighbors.find(make_pair(trg.m_p[my::NextModN(j, 3)], trg.m_p[j])); + it = m_neighbors.find(std::make_pair(trg.m_p[my::NextModN(j, 3)], trg.m_p[j])); nb[ind++] = (it != m_neighbors.end()) ? it->second : empty_key; } @@ -158,7 +158,7 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) uint64_t TrianglesInfo::ListInfo::CalcDelta( PointsInfo const & points, Triangle const & from, Triangle const & to) const { - pair<int, int> const p = CommonEdge(to, from); + std::pair<int, int> const p = CommonEdge(to, from); m2::PointU const prediction = PredictPointInTriangle(points.m_max, @@ -174,13 +174,13 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) template <class TPopOrder> void TrianglesInfo::ListInfo::MakeTrianglesChainImpl( - PointsInfo const & points, TIterator start, vector<Edge> & chain) const + PointsInfo const & points, TIterator start, std::vector<Edge> & chain) const { chain.clear(); Triangle const fictive(start->first.second, start->first.first, -1); - priority_queue<Edge, vector<Edge>, TPopOrder> q; + std::priority_queue<Edge, std::vector<Edge>, TPopOrder> q; q.push(Edge(-1, start->second, 0, -1)); while (!q.empty()) @@ -229,7 +229,7 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) }; void TrianglesInfo::ListInfo::MakeTrianglesChain( - PointsInfo const & points, TIterator start, vector<Edge> & chain, bool /*goodOrder*/) const + PointsInfo const & points, TIterator start, std::vector<Edge> & chain, bool /*goodOrder*/) const { //if (goodOrder) MakeTrianglesChainImpl<edge_greater_delta>(points, start, chain); @@ -244,7 +244,7 @@ int TesselateInterior(PolygonsT const & polys, TrianglesInfo & info) void TrianglesInfo::GetPointsInfo(m2::PointU const & baseP, m2::PointU const & maxP, - function<m2::PointU (m2::PointD)> const & convert, + std::function<m2::PointU (m2::PointD)> const & convert, PointsInfo & info) const { info.m_base = baseP; |