summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/buckets/symbol_bucket.hpp
diff options
context:
space:
mode:
authorAlexander Shalamov <alexander.shalamov@mapbox.com>2019-12-04 14:53:32 +0200
committerAlexander Shalamov <alexander.shalamov@mapbox.com>2019-12-05 19:04:15 +0200
commitc2899f76b68ebaa2bba61e4407e128ab261ab212 (patch)
tree873acb061104f43b2c5e47bb42c209486b8be3a6 /src/mbgl/renderer/buckets/symbol_bucket.hpp
parent27536631d01d623bb4a08c3e85f2a62a6d187a12 (diff)
downloadqtlocation-mapboxgl-c2899f76b68ebaa2bba61e4407e128ab261ab212.tar.gz
[core] Don't use signed int type for anchor segmentupstream/alexshalamov_signed_to_unsigned_conversion
Diffstat (limited to 'src/mbgl/renderer/buckets/symbol_bucket.hpp')
-rw-r--r--src/mbgl/renderer/buckets/symbol_bucket.hpp28
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;