summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-20 12:38:09 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-30 23:37:44 +0300
commit65f4df5190d764a12a2c8054bfce2838545917e7 (patch)
tree4b0ae8b13e19d88af1b6e3c7ae2c05d41069723c /src/mbgl/renderer
parent5fa7ff3b63226bda5fe18a89794c76e86f81c4f8 (diff)
downloadqtlocation-mapboxgl-65f4df5190d764a12a2c8054bfce2838545917e7.tar.gz
[core] Fix google-readability-casting errors
As reported by clang-tidy-8.
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r--src/mbgl/renderer/layers/render_hillshade_layer.cpp2
-rw-r--r--src/mbgl/renderer/tile_pyramid.cpp10
2 files changed, 6 insertions, 6 deletions
diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp
index bf899221f8..5c4d4f1d95 100644
--- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp
+++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp
@@ -36,7 +36,7 @@ RenderHillshadeLayer::~RenderHillshadeLayer() = default;
const std::array<float, 2> RenderHillshadeLayer::getLatRange(const UnwrappedTileID& id) {
const LatLng latlng0 = LatLng(id);
const LatLng latlng1 = LatLng(UnwrappedTileID(id.canonical.z, id.canonical.x, id.canonical.y + 1));
- return {{ (float)latlng0.latitude(), (float)latlng1.latitude() }};
+ return {{static_cast<float>(latlng0.latitude()), static_cast<float>(latlng1.latitude())}};
}
const std::array<float, 2> RenderHillshadeLayer::getLight(const PaintParameters& parameters) {
diff --git a/src/mbgl/renderer/tile_pyramid.cpp b/src/mbgl/renderer/tile_pyramid.cpp
index fc59634723..f7f02f5582 100644
--- a/src/mbgl/renderer/tile_pyramid.cpp
+++ b/src/mbgl/renderer/tile_pyramid.cpp
@@ -145,7 +145,8 @@ void TilePyramid::update(const std::vector<Immutable<style::LayerProperties>>& l
// tiles are used from the cache, but not created.
optional<util::TileRange> tileRange = {};
if (bounds) {
- tileRange = util::TileRange::fromLatLngBounds(*bounds, zoomRange.min, std::min(tileZoom, (int32_t)zoomRange.max));
+ tileRange = util::TileRange::fromLatLngBounds(
+ *bounds, zoomRange.min, std::min(tileZoom, static_cast<int32_t>(zoomRange.max)));
}
auto createTileFn = [&](const OverscaledTileID& tileID) -> Tile* {
if (tileRange && !tileRange->contains(tileID.canonical)) {
@@ -196,10 +197,9 @@ void TilePyramid::update(const std::vector<Immutable<style::LayerProperties>>& l
if (type != SourceType::Annotations) {
size_t conservativeCacheSize =
- std::max((float)parameters.transformState.getSize().width / tileSize, 1.0f) *
- std::max((float)parameters.transformState.getSize().height / tileSize, 1.0f) *
- (parameters.transformState.getMaxZoom() - parameters.transformState.getMinZoom() + 1) *
- 0.5;
+ std::max(static_cast<float>(parameters.transformState.getSize().width) / tileSize, 1.0f) *
+ std::max(static_cast<float>(parameters.transformState.getSize().height) / tileSize, 1.0f) *
+ (parameters.transformState.getMaxZoom() - parameters.transformState.getMinZoom() + 1) * 0.5;
cache.setSize(conservativeCacheSize);
}