diff options
| author | Ansis Brammanis <ansis@mapbox.com> | 2017-11-07 16:10:58 -0500 |
|---|---|---|
| committer | Ansis Brammanis <ansis@mapbox.com> | 2017-11-09 13:11:31 -0500 |
| commit | cd10190515693dae6cca7ad9087046a8dd2350a6 (patch) | |
| tree | 4adc154d0a880486f0abc45c83755ca525375979 /src/mbgl/text/collision_index.cpp | |
| parent | 0f4eed2959f7741ccf73dd79297b5fe17ff23829 (diff) | |
| download | qtlocation-mapboxgl-upstream/start-collision-async.tar.gz | |
partially do Placement asyncupstream/start-collision-async
Diffstat (limited to 'src/mbgl/text/collision_index.cpp')
| -rw-r--r-- | src/mbgl/text/collision_index.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mbgl/text/collision_index.cpp b/src/mbgl/text/collision_index.cpp index 05a0450465..08910fa619 100644 --- a/src/mbgl/text/collision_index.cpp +++ b/src/mbgl/text/collision_index.cpp @@ -56,7 +56,7 @@ bool CollisionIndex::placeFeature(CollisionFeature& feature, const mat4& posMatrix, const mat4& labelPlaneMatrix, const float textPixelRatio, - PlacedSymbol& symbol, + const PlacedSymbol& symbol, const float scale, const float fontSize, const bool allowOverlap, @@ -87,7 +87,7 @@ bool CollisionIndex::placeLineFeature(CollisionFeature& feature, const mat4& posMatrix, const mat4& labelPlaneMatrix, const float textPixelRatio, - PlacedSymbol& symbol, + const PlacedSymbol& symbol, const float scale, const float fontSize, const bool allowOverlap, @@ -201,7 +201,7 @@ bool CollisionIndex::placeLineFeature(CollisionFeature& feature, } -void CollisionIndex::insertFeature(CollisionFeature& feature, bool ignorePlacement) { +void CollisionIndex::insertFeature(const CollisionFeature& feature, bool ignorePlacement) { if (feature.alongLine) { for (auto& circle : feature.boxes) { if (!circle.used) { |