diff options
| author | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-07 18:16:29 +0200 |
|---|---|---|
| committer | Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com> | 2018-11-07 18:42:22 +0200 |
| commit | c8f59d3692ad086bf49c3a97335a23804a503dd3 (patch) | |
| tree | e91d24ec1b8829e5dc2c01f8ea56f9cdb520f366 | |
| parent | 3ef95685ed86183aefdc3b1fcbb43e440ac0ef81 (diff) | |
| download | qtlocation-mapboxgl-upstream/jrex/4352-resize-mapview.tar.gz | |
[mac] Fix wrong allocation at layerFromMBGLLayerupstream/jrex/4352-resize-mapview
A leftover from https://github.com/mapbox/mapbox-gl-native/pull/13221
| -rw-r--r-- | platform/darwin/src/MGLStyle.mm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm index 7d79a06fb1..437da3fd4f 100644 --- a/platform/darwin/src/MGLStyle.mm +++ b/platform/darwin/src/MGLStyle.mm @@ -354,23 +354,23 @@ static_assert(6 == mbgl::util::default_styles::numOrderedStyles, case mbgl::style::LayerType::Fill: return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::FillLayer*>(rawLayer)]; case mbgl::style::LayerType::FillExtrusion: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::FillExtrusionLayer*>(rawLayer)]; + return [[MGLFillExtrusionStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::FillExtrusionLayer*>(rawLayer)]; case mbgl::style::LayerType::Line: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::LineLayer*>(rawLayer)]; + return [[MGLLineStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::LineLayer*>(rawLayer)]; case mbgl::style::LayerType::Symbol: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::SymbolLayer*>(rawLayer)]; + return [[MGLSymbolStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::SymbolLayer*>(rawLayer)]; case mbgl::style::LayerType::Raster: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::RasterLayer*>(rawLayer)]; + return [[MGLRasterStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::RasterLayer*>(rawLayer)]; case mbgl::style::LayerType::Heatmap: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::HeatmapLayer*>(rawLayer)]; + return [[MGLHeatmapStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::HeatmapLayer*>(rawLayer)]; case mbgl::style::LayerType::Hillshade: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::HillshadeLayer*>(rawLayer)]; + return [[MGLHillshadeStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::HillshadeLayer*>(rawLayer)]; case mbgl::style::LayerType::Circle: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::CircleLayer*>(rawLayer)]; + return [[MGLCircleStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::CircleLayer*>(rawLayer)]; case mbgl::style::LayerType::Background: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::BackgroundLayer*>(rawLayer)]; + return [[MGLBackgroundStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::BackgroundLayer*>(rawLayer)]; case mbgl::style::LayerType::Custom: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::CustomLayer*>(rawLayer)]; + return [[MGLOpenGLStyleLayer alloc] initWithRawLayer:static_cast<mbgl::style::CustomLayer*>(rawLayer)]; default: NSAssert(NO, @"Unrecognized layer type"); return nil;; |