diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-20 12:38:09 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-23 20:05:40 +0200 |
| commit | cee3910f179c39d5dc14e6e4307f5d51bb4d1256 (patch) | |
| tree | 149648aab15f6ab2c5536cc29bcf15c00880530a /src/mbgl/programs | |
| parent | 47594f003bc0dbdb2419715d3f7d0e989bb332d8 (diff) | |
| download | qtlocation-mapboxgl-cee3910f179c39d5dc14e6e4307f5d51bb4d1256.tar.gz | |
[core] Fix modernize-return-braced-init-list errors
As reported by clang-tidy-8.
Diffstat (limited to 'src/mbgl/programs')
| -rw-r--r-- | src/mbgl/programs/symbol_program.cpp | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/src/mbgl/programs/symbol_program.cpp b/src/mbgl/programs/symbol_program.cpp index 5e3e12a1f8..c4a86bb074 100644 --- a/src/mbgl/programs/symbol_program.cpp +++ b/src/mbgl/programs/symbol_program.cpp @@ -168,19 +168,18 @@ SymbolTextAndIconProgram::LayoutUniformValues SymbolTextAndIconProgram::layoutUn const TransformState& state, const float symbolFadeChange, const SymbolSDFPart part) { - return SymbolTextAndIconProgram::LayoutUniformValues( - SymbolSDFProgram<SymbolSDFTextProgram, style::TextPaintProperties>::layoutUniformValues(true, - hasVariablePacement, - values, - texsize, - pixelsToGLUnits, - pixelRatio, - alongLine, - tile, - state, - symbolFadeChange, - part) - .concat(gfx::UniformValues<SymbolTextAndIconProgramUniforms>(uniforms::texsize::Value(texsize_icon)))); + return {SymbolSDFProgram<SymbolSDFTextProgram, style::TextPaintProperties>::layoutUniformValues(true, + hasVariablePacement, + values, + texsize, + pixelsToGLUnits, + pixelRatio, + alongLine, + tile, + state, + symbolFadeChange, + part) + .concat(gfx::UniformValues<SymbolTextAndIconProgramUniforms>(uniforms::texsize::Value(texsize_icon)))}; } template class SymbolSDFProgram<SymbolSDFIconProgram, style::IconPaintProperties>; |