diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-04-03 12:27:14 +0200 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-04-05 11:49:17 +0200 |
commit | 3ceabcd3ec91dbd9458d3c5b78fb12c3182636e1 (patch) | |
tree | b8be2ac790afce844178a314b42683ab9d06f744 /src/mbgl/renderer/sources | |
parent | d7aaf83421261087a99d18d92eca9637c1bf72f8 (diff) | |
download | qtlocation-mapboxgl-3ceabcd3ec91dbd9458d3c5b78fb12c3182636e1.tar.gz |
[core] clang-tidy fixes
Diffstat (limited to 'src/mbgl/renderer/sources')
-rw-r--r-- | src/mbgl/renderer/sources/render_geojson_source.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_image_source.cpp | 6 | ||||
-rw-r--r-- | src/mbgl/renderer/sources/render_raster_dem_source.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/mbgl/renderer/sources/render_geojson_source.cpp b/src/mbgl/renderer/sources/render_geojson_source.cpp index 5eb6a931d3..3cfcfc7392 100644 --- a/src/mbgl/renderer/sources/render_geojson_source.cpp +++ b/src/mbgl/renderer/sources/render_geojson_source.cpp @@ -66,7 +66,7 @@ MAPBOX_ETERNAL_CONSTEXPR const auto extensionGetters = mapbox::eternal::hash_map {"expansion-zoom", &getClusterExpansionZoom} }); -} +} // namespace RenderGeoJSONSource::RenderGeoJSONSource(Immutable<style::GeoJSONSource::Impl> impl_) : RenderSource(impl_) { diff --git a/src/mbgl/renderer/sources/render_image_source.cpp b/src/mbgl/renderer/sources/render_image_source.cpp index 102125be19..7190f25bc7 100644 --- a/src/mbgl/renderer/sources/render_image_source.cpp +++ b/src/mbgl/renderer/sources/render_image_source.cpp @@ -38,10 +38,10 @@ void RenderImageSource::startRender(PaintParameters& parameters) { matrices.clear(); - for (size_t i = 0; i < tileIds.size(); i++) { + for (auto& tileId : tileIds) { mat4 matrix; matrix::identity(matrix); - parameters.state.matrixFor(matrix, tileIds[i]); + parameters.state.matrixFor(matrix, tileId); matrix::multiply(matrix, parameters.alignedProjMatrix, matrix); matrices.push_back(matrix); } @@ -167,7 +167,7 @@ void RenderImageSource::update(Immutable<style::Source::Impl> baseImpl_, auto idealTiles = util::tileCover(transformState, transformState.getZoom()); for (auto tile : idealTiles) { if (tile.wrap != 0 && tileCover[0].canonical.isChildOf(tile.canonical)) { - tileIds.push_back({ tile.wrap, tileCover[0].canonical }); + tileIds.emplace_back(tile.wrap, tileCover[0].canonical); hasVisibleTile = true; } else if (!hasVisibleTile) { diff --git a/src/mbgl/renderer/sources/render_raster_dem_source.cpp b/src/mbgl/renderer/sources/render_raster_dem_source.cpp index 2bc3a91c7c..63ab3ca370 100644 --- a/src/mbgl/renderer/sources/render_raster_dem_source.cpp +++ b/src/mbgl/renderer/sources/render_raster_dem_source.cpp @@ -60,7 +60,7 @@ void RenderRasterDEMSource::update(Immutable<style::Source::Impl> baseImpl_, } void RenderRasterDEMSource::onTileChanged(Tile& tile){ - RasterDEMTile& demtile = static_cast<RasterDEMTile&>(tile); + auto& demtile = static_cast<RasterDEMTile&>(tile); std::map<DEMTileNeighbors, DEMTileNeighbors> opposites = { { DEMTileNeighbors::Left, DEMTileNeighbors::Right }, @@ -104,13 +104,13 @@ void RenderRasterDEMSource::onTileChanged(Tile& tile){ }; for (uint8_t i = 0; i < 8; i++) { - DEMTileNeighbors mask = DEMTileNeighbors(std::pow(2,i)); + auto mask = DEMTileNeighbors(std::pow(2,i)); // only backfill if this neighbor has not been previously backfilled if ((demtile.neighboringTiles & mask) != mask) { OverscaledTileID neighborid = getNeighbor(mask); Tile* renderableNeighbor = tilePyramid.getTile(neighborid); if (renderableNeighbor != nullptr && renderableNeighbor->isRenderable()) { - RasterDEMTile& borderTile = static_cast<RasterDEMTile&>(*renderableNeighbor); + auto& borderTile = static_cast<RasterDEMTile&>(*renderableNeighbor); demtile.backfillBorder(borderTile, mask); // if the border tile has not been backfilled by a previous instance of the main |