diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-17 17:00:56 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-23 12:59:27 -0700 |
commit | 72b13cef6a83594b15f47bfeaee782504def619e (patch) | |
tree | b78d9d585ec99823efc62ffb26e8299b099ee8c2 /src/mbgl/text/shaping.cpp | |
parent | 3d26574cb4077a8b48071e08f07574964587f747 (diff) | |
download | qtlocation-mapboxgl-72b13cef6a83594b15f47bfeaee782504def619e.tar.gz |
[core] Remove unnecessary optionals in PositionedIcon
Lack of icon is already checked at the call site of shapeIcon; no need to check hasArea() here.
Diffstat (limited to 'src/mbgl/text/shaping.cpp')
-rw-r--r-- | src/mbgl/text/shaping.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/mbgl/text/shaping.cpp b/src/mbgl/text/shaping.cpp index 5c99a49133..6ee646be96 100644 --- a/src/mbgl/text/shaping.cpp +++ b/src/mbgl/text/shaping.cpp @@ -10,11 +10,7 @@ namespace mbgl { -optional<PositionedIcon> PositionedIcon::shapeIcon(const SpriteAtlasElement& image, const std::array<float, 2>& iconOffset, const float iconRotation) { - if (!image.pos.hasArea()) { - return {}; - } - +PositionedIcon PositionedIcon::shapeIcon(const SpriteAtlasElement& image, const std::array<float, 2>& iconOffset, const float iconRotation) { float dx = iconOffset[0]; float dy = iconOffset[1]; float x1 = dx - image.size[0] / 2.0f; @@ -22,7 +18,7 @@ optional<PositionedIcon> PositionedIcon::shapeIcon(const SpriteAtlasElement& ima float y1 = dy - image.size[1] / 2.0f; float y2 = y1 + image.size[1]; - return { PositionedIcon { image, y1, y2, x1, x2, iconRotation } }; + return PositionedIcon { image, y1, y2, x1, x2, iconRotation }; } void align(Shaping& shaping, |