diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-04 14:53:32 +0200 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2019-12-09 17:26:13 +0200 |
commit | b6b077d73aa63160b0860fd24e144f80f428ff1d (patch) | |
tree | 3dfb37bbd219c14a262c1867f6e82f6f60758f91 /src/mbgl/renderer | |
parent | 71054c8b609f02403bf28e91c4c4ab14f1468e5d (diff) | |
download | qtlocation-mapboxgl-b6b077d73aa63160b0860fd24e144f80f428ff1d.tar.gz |
[core] Don't use signed int type for anchor segment
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.hpp | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/src/mbgl/renderer/buckets/symbol_bucket.hpp b/src/mbgl/renderer/buckets/symbol_bucket.hpp index 7a60a2c1e4..1d1aa13dd0 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.hpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.hpp @@ -20,14 +20,28 @@ class CrossTileSymbolLayerIndex; class PlacedSymbol { public: - PlacedSymbol(Point<float> anchorPoint_, uint16_t segment_, float lowerSize_, float upperSize_, - std::array<float, 2> lineOffset_, WritingModeType writingModes_, GeometryCoordinates line_, std::vector<float> tileDistances_, optional<size_t> placedIconIndex_ = nullopt) : - anchorPoint(anchorPoint_), segment(segment_), lowerSize(lowerSize_), upperSize(upperSize_), - lineOffset(lineOffset_), writingModes(writingModes_), line(std::move(line_)), tileDistances(std::move(tileDistances_)), hidden(false), vertexStartIndex(0), placedIconIndex(std::move(placedIconIndex_)) - { - } + PlacedSymbol(Point<float> anchorPoint_, + std::size_t segment_, + float lowerSize_, + float upperSize_, + std::array<float, 2> lineOffset_, + WritingModeType writingModes_, + GeometryCoordinates line_, + std::vector<float> tileDistances_, + optional<size_t> placedIconIndex_ = nullopt) + : anchorPoint(anchorPoint_), + segment(segment_), + lowerSize(lowerSize_), + upperSize(upperSize_), + lineOffset(lineOffset_), + writingModes(writingModes_), + line(std::move(line_)), + tileDistances(std::move(tileDistances_)), + hidden(false), + vertexStartIndex(0), + placedIconIndex(std::move(placedIconIndex_)) {} Point<float> anchorPoint; - uint16_t segment; + std::size_t segment; float lowerSize; float upperSize; std::array<float, 2> lineOffset; |