diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-23 16:08:44 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-07-24 11:08:40 -0700 |
| commit | 2bbc79206073d260863c887a95ee4ba25bc45910 (patch) | |
| tree | 4478ba0db1d873ed35e80b7e342100d85728ed18 /src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp | |
| parent | cb714d57c5c5ad181aaf5e1690221da8d965682b (diff) | |
| download | qtlocation-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_fill_extrusion_layer.cpp')
| -rw-r--r-- | src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp index d5282c9b0d..d37f6f528b 100644 --- a/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp +++ b/src/mbgl/renderer/layers/render_fill_extrusion_layer.cpp @@ -100,9 +100,11 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* if (evaluated.get<FillExtrusionPattern>().from.empty()) { for (const RenderTile& tile : renderTiles) { - assert(dynamic_cast<FillExtrusionBucket*>(tile.tile.getBucket(*baseImpl))); - FillExtrusionBucket& bucket = - *reinterpret_cast<FillExtrusionBucket*>(tile.tile.getBucket(*baseImpl)); + auto bucket_ = dynamic_cast<FillExtrusionBucket*>(tile.tile.getBucket(*baseImpl)); + if (!bucket_) { + continue; + } + FillExtrusionBucket& bucket = *bucket_; draw( parameters.programs.fillExtrusion.get(evaluated), @@ -129,9 +131,11 @@ void RenderFillExtrusionLayer::render(PaintParameters& parameters, RenderSource* parameters.imageManager.bind(parameters.context, 0); for (const RenderTile& tile : renderTiles) { - assert(dynamic_cast<FillExtrusionBucket*>(tile.tile.getBucket(*baseImpl))); - FillExtrusionBucket& bucket = - *reinterpret_cast<FillExtrusionBucket*>(tile.tile.getBucket(*baseImpl)); + auto bucket_ = dynamic_cast<FillExtrusionBucket*>(tile.tile.getBucket(*baseImpl)); + if (!bucket_) { + continue; + } + FillExtrusionBucket& bucket = *bucket_; draw( parameters.programs.fillExtrusionPattern.get(evaluated), |