fix typo

3 files changed, 10 insertions, 8 deletions

diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp
index 1061934b47..8bdba85115 100644
--- a/src/mbgl/renderer/buckets/symbol_bucket.cpp
+++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp
@@ -247,9 +247,11 @@ void SymbolBucket::sortFeatures(const float angle) {
 
         if (symbolInstance.placedVerticalIconIndex) {
             if (symbolInstance.hasSdfIcon()) {
-                addPlacedSymbol(sdfIcon.triangles,               sdfIcon.placedSymbols[*symbolInstance.placedVerticalIconIndex]);
+                addPlacedSymbol(sdfIcon.triangles,
+                                sdfIcon.placedSymbols[*symbolInstance.placedVerticalIconIndex]);
             } else {
-                addPlacedSymbol(icon.triangles, icon.placedSymbols[*symbolInstance.placedVerticalIconIndex]);
+                addPlacedSymbol(icon.triangles,
+                                icon.placedSymbols[*symbolInstance.placedVerticalIconIndex]);
             }
         }
     }
diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp
index 54d982127d..353ba0a164 100644
--- a/src/mbgl/renderer/layers/render_symbol_layer.cpp
+++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp
@@ -111,7 +111,7 @@ void drawIcon(const DrawFn& draw,
               SegmentsWrapper iconSegments,
               const SymbolBucket::PaintProperties& bucketPaintProperties,
               const PaintParameters& parameters,
-              bool sdfIcons = false) {
+              const bool sdfIcons) {
     auto& bucket = static_cast<SymbolBucket&>(*renderData.bucket);
     const auto& evaluated = getEvaluated<SymbolLayerProperties>(renderData.layerProperties);
     const auto& layout = *bucket.layout;
@@ -137,7 +137,7 @@ void drawIcon(const DrawFn& draw,
     if (sdfIcons) {
         if (values.hasHalo) {
             draw(parameters.programs.getSymbolLayerPrograms().symbolIconSDF,
-                SymbolSDFIconProgram::layoutUniformValues(false, false, values, iconSize, parameters.pixelsToGLUnits, parameters.pixelRatio, alongLine, tile, parameters.state, parameters.symbolFadeChange, SymbolSDFPart::Halo),
+                SymbolSDFIconProgram::layoutUniformValues(false, variablePlacedIcon, values, iconSize, parameters.pixelsToGLUnits, parameters.pixelRatio, alongLine, tile, parameters.state, parameters.symbolFadeChange, SymbolSDFPart::Halo),
                 bucket.sdfIcon,
                 iconSegments,
                 bucket.iconSizeBinder,
@@ -151,7 +151,7 @@ void drawIcon(const DrawFn& draw,
 
         if (values.hasFill) {
             draw(parameters.programs.getSymbolLayerPrograms().symbolIconSDF,
-                SymbolSDFIconProgram::layoutUniformValues(false, false, values, iconSize, parameters.pixelsToGLUnits, parameters.pixelRatio, alongLine, tile, parameters.state, parameters.symbolFadeChange, SymbolSDFPart::Fill),
+                SymbolSDFIconProgram::layoutUniformValues(false, variablePlacedIcon, values, iconSize, parameters.pixelsToGLUnits, parameters.pixelRatio, alongLine, tile, parameters.state, parameters.symbolFadeChange, SymbolSDFPart::Fill),
                 bucket.sdfIcon,
                 iconSegments,
                 bucket.iconSizeBinder,
@@ -378,7 +378,7 @@ void RenderSymbolLayer::render(PaintParameters& parameters) {
             if (sortFeaturesByKey) {
                 addRenderables(renderableSegments, bucket.icon.segments, false /*isText*/);
             } else {
-                drawIcon(draw, tile, *renderData, std::ref(bucket.icon.segments), bucketPaintProperties, parameters);
+                drawIcon(draw, tile, *renderData, std::ref(bucket.icon.segments), bucketPaintProperties, parameters, false);
             }
         }
         
diff --git a/src/mbgl/text/placement.cpp b/src/mbgl/text/placement.cpp
index 06a8628b6d..ce2b9734ac 100644
--- a/src/mbgl/text/placement.cpp
+++ b/src/mbgl/text/placement.cpp
@@ -554,8 +554,8 @@ bool Placement::updateBucketDynamicVertices(SymbolBucket& bucket, const Transfor
             }
             if (bucket.hasIconData()) {
                 reprojectLineLabels(bucket.icon.dynamicVertices, bucket.icon.placedSymbols,
-                    tile.matrix, pitchWithMap, true /*rotateWithMap*/, keepUpright,
-                    tile, *bucket.iconSizeBinder, state);
+                                    tile.matrix, pitchWithMap, true /*rotateWithMap*/, keepUpright,
+                                    tile, *bucket.iconSizeBinder, state);
                 result = true;
             }
         }