From c8f59d3692ad086bf49c3a97335a23804a503dd3 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Wed, 7 Nov 2018 18:16:29 +0200 Subject: [PATCH] [mac] Fix wrong allocation at layerFromMBGLLayer A leftover from https://github.com/mapbox/mapbox-gl-native/pull/13221 --- platform/darwin/src/MGLStyle.mm | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/platform/darwin/src/MGLStyle.mm b/platform/darwin/src/MGLStyle.mm index 7d79a06fb..437da3fd4 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(rawLayer)]; case mbgl::style::LayerType::FillExtrusion: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; + return [[MGLFillExtrusionStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; case mbgl::style::LayerType::Line: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; + return [[MGLLineStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; case mbgl::style::LayerType::Symbol: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; + return [[MGLSymbolStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; case mbgl::style::LayerType::Raster: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; + return [[MGLRasterStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; case mbgl::style::LayerType::Heatmap: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; + return [[MGLHeatmapStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; case mbgl::style::LayerType::Hillshade: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; + return [[MGLHillshadeStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; case mbgl::style::LayerType::Circle: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; + return [[MGLCircleStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; case mbgl::style::LayerType::Background: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; + return [[MGLBackgroundStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; case mbgl::style::LayerType::Custom: - return [[MGLFillStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; + return [[MGLOpenGLStyleLayer alloc] initWithRawLayer:static_cast(rawLayer)]; default: NSAssert(NO, @"Unrecognized layer type"); return nil;;