tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix name shadowing

Browse Source
This commit is contained in:
John Firebaugh
2015-06-09 11:37:00 -04:00
parent db1202e8e3
commit 3ab682e627
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mbgl/text/collision_tile.cpp
View File

@@ -91,11 +91,11 @@ void CollisionTile::insertFeature(CollisionFeature &feature, const float minPlac
Box CollisionTile::getTreeBox(const vec2<float> &anchor, const CollisionBox &box) {
return Box{
Point{
CollisionPoint{
anchor.x + box.x1,
anchor.y + box.y1 * yStretch
},
Point{
CollisionPoint{
anchor.x + box.x2,
anchor.y + box.y2 * yStretch
}

4
src/mbgl/text/collision_tile.hpp
View File

@@ -27,8 +27,8 @@ namespace mbgl {
namespace bg = boost::geometry;
namespace bgm = bg::model;
namespace bgi = bg::index;
typedef bgm::point<float, 2, bg::cs::cartesian> Point;
typedef bgm::box<Point> Box;
typedef bgm::point<float, 2, bg::cs::cartesian> CollisionPoint;
typedef bgm::box<CollisionPoint> Box;
typedef std::pair<Box, CollisionBox> CollisionTreeBox;
typedef bgi::rtree<CollisionTreeBox, bgi::linear<16,4>> Tree;