summaryrefslogtreecommitdiff
path: root/src/mbgl/renderer/layers/render_hillshade_layer.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2018-07-23 16:08:44 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2018-07-24 11:08:40 -0700
commit2bbc79206073d260863c887a95ee4ba25bc45910 (patch)
tree4478ba0db1d873ed35e80b7e342100d85728ed18 /src/mbgl/renderer/layers/render_hillshade_layer.cpp
parentcb714d57c5c5ad181aaf5e1690221da8d965682b (diff)
downloadqtlocation-mapboxgl-2bbc79206073d260863c887a95ee4ba25bc45910.tar.gz
[core] Check all bucket dynamic_casts
A mismatch can occur when a layer changes from one type to another.
Diffstat (limited to 'src/mbgl/renderer/layers/render_hillshade_layer.cpp')
-rw-r--r--src/mbgl/renderer/layers/render_hillshade_layer.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mbgl/renderer/layers/render_hillshade_layer.cpp b/src/mbgl/renderer/layers/render_hillshade_layer.cpp
index 411305edf4..0edc8737c1 100644
--- a/src/mbgl/renderer/layers/render_hillshade_layer.cpp
+++ b/src/mbgl/renderer/layers/render_hillshade_layer.cpp
@@ -114,8 +114,12 @@ void RenderHillshadeLayer::render(PaintParameters& parameters, RenderSource* src
matrix::translate(mat, mat, 0, -util::EXTENT, 0);
for (const RenderTile& tile : renderTiles) {
- assert(dynamic_cast<HillshadeBucket*>(tile.tile.getBucket(*baseImpl)));
- HillshadeBucket& bucket = *reinterpret_cast<HillshadeBucket*>(tile.tile.getBucket(*baseImpl));
+ auto bucket_ = dynamic_cast<HillshadeBucket*>(tile.tile.getBucket(*baseImpl));
+ if (!bucket_) {
+ continue;
+ }
+ HillshadeBucket& bucket = *bucket_;
+
if (!bucket.hasData()){
continue;
}