diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2018-10-30 15:59:47 +0200 |
---|---|---|
committer | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2018-11-19 14:06:21 +0200 |
commit | 05d5edfa74ebc74d5e74560b597be5aec6f4e9e8 (patch) | |
tree | 2b33f567aab34704c8a545656347aff9e309d58e /src/mbgl/layout | |
parent | 767745e8b85bdeabde5781c87ac9c31a3617c4ff (diff) | |
download | qtlocation-mapboxgl-05d5edfa74ebc74d5e74560b597be5aec6f4e9e8.tar.gz |
[core] Remove casts where expected type is part of the contract
Diffstat (limited to 'src/mbgl/layout')
-rw-r--r-- | src/mbgl/layout/pattern_layout.hpp | 4 | ||||
-rw-r--r-- | src/mbgl/layout/symbol_layout.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/layout/pattern_layout.hpp b/src/mbgl/layout/pattern_layout.hpp index 0ffac36b75..a29221c547 100644 --- a/src/mbgl/layout/pattern_layout.hpp +++ b/src/mbgl/layout/pattern_layout.hpp @@ -37,14 +37,14 @@ public: hasPattern(false) { using PatternLayer = typename B::RenderLayerType; - const auto renderLayer = layers.at(0)->as<PatternLayer>(); + const auto renderLayer = static_cast<const PatternLayer*>(layers.at(0)); const typename PatternLayer::StyleLayerImpl& leader = renderLayer->impl(); layout = leader.layout.evaluate(PropertyEvaluationParameters(zoom)); sourceLayerID = leader.sourceLayer; groupID = renderLayer->getID(); for (const auto& layer : layers) { - const typename B::PossiblyEvaluatedPaintProperties evaluatedProps = layer->as<PatternLayer>()->paintProperties(); + const typename B::PossiblyEvaluatedPaintProperties evaluatedProps = static_cast<const PatternLayer*>(layer)->paintProperties(); layerPaintProperties.emplace(layer->getID(), std::move(evaluatedProps)); const auto patternProperty = evaluatedProps.template get<typename PatternLayer::PatternProperty>(); const auto constantPattern = patternProperty.constantOr(Faded<std::basic_string<char> >{ "", ""}); diff --git a/src/mbgl/layout/symbol_layout.cpp b/src/mbgl/layout/symbol_layout.cpp index 6d20afeb8d..332fb3f46a 100644 --- a/src/mbgl/layout/symbol_layout.cpp +++ b/src/mbgl/layout/symbol_layout.cpp @@ -50,11 +50,11 @@ SymbolLayout::SymbolLayout(const BucketParameters& parameters, pixelRatio(parameters.pixelRatio), tileSize(util::tileSize * overscaling), tilePixelRatio(float(util::EXTENT) / tileSize), - textSize(layers.at(0)->as<RenderSymbolLayer>()->impl().layout.get<TextSize>()), - iconSize(layers.at(0)->as<RenderSymbolLayer>()->impl().layout.get<IconSize>()) + textSize(toRenderSymbolLayer(layers.at(0))->impl().layout.get<TextSize>()), + iconSize(toRenderSymbolLayer(layers.at(0))->impl().layout.get<IconSize>()) { - const SymbolLayer::Impl& leader = layers.at(0)->as<RenderSymbolLayer>()->impl(); + const SymbolLayer::Impl& leader = toRenderSymbolLayer(layers.at(0))->impl(); layout = leader.layout.evaluate(PropertyEvaluationParameters(zoom)); @@ -91,8 +91,8 @@ SymbolLayout::SymbolLayout(const BucketParameters& parameters, for (const auto& layer : layers) { layerPaintProperties.emplace(layer->getID(), std::make_pair( - layer->as<RenderSymbolLayer>()->iconPaintProperties(), - layer->as<RenderSymbolLayer>()->textPaintProperties() + toRenderSymbolLayer(layer)->iconPaintProperties(), + toRenderSymbolLayer(layer)->textPaintProperties() )); } |