diff options
Diffstat (limited to 'src/mbgl/layout/symbol_instance.cpp')
-rw-r--r-- | src/mbgl/layout/symbol_instance.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/mbgl/layout/symbol_instance.cpp b/src/mbgl/layout/symbol_instance.cpp index c5b11dbe00..a8b568d1cb 100644 --- a/src/mbgl/layout/symbol_instance.cpp +++ b/src/mbgl/layout/symbol_instance.cpp @@ -108,8 +108,8 @@ SymbolInstance::SymbolInstance(Anchor& anchor_, radialTextOffset(radialTextOffset_), singleLine(shapedTextOrientations.singleLine) { assert(iconFlag < 3); - sdfIcon = iconFlag & 0x02; - normalIcon = iconFlag & 0x01; + hasIcon = iconFlag & 0x03; + hasSdfIcon = iconFlag & 0x02; if (allowVerticalPlacement && shapedTextOrientations.vertical) { const float verticalPointLabelAngle = 90.0f; verticalTextCollisionFeature = CollisionFeature(line(), anchor, shapedTextOrientations.vertical, textBoxScale_, textPadding, textPlacement, indexedFeature, overscaling, textRotation + verticalPointLabelAngle); @@ -172,14 +172,6 @@ const optional<SymbolQuad>& SymbolInstance::verticalIconQuad() const { return sharedData->verticalIconQuad; } -bool SymbolInstance::hasIcon() const { - return normalIcon || sdfIcon; -} - -bool SymbolInstance::hasSdfIcon() const { - return sdfIcon; -} - void SymbolInstance::releaseSharedData() { sharedData.reset(); } |