diff options
Diffstat (limited to 'src/mbgl/renderer')
-rw-r--r-- | src/mbgl/renderer/buckets/line_bucket.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/renderer/buckets/symbol_bucket.cpp | 5 | ||||
-rw-r--r-- | src/mbgl/renderer/image_manager.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/renderer/layers/render_symbol_layer.cpp | 14 | ||||
-rw-r--r-- | src/mbgl/renderer/property_evaluation_parameters.hpp | 9 | ||||
-rw-r--r-- | src/mbgl/renderer/render_tile.cpp | 4 | ||||
-rw-r--r-- | src/mbgl/renderer/renderer.cpp | 9 |
7 files changed, 16 insertions, 32 deletions
diff --git a/src/mbgl/renderer/buckets/line_bucket.cpp b/src/mbgl/renderer/buckets/line_bucket.cpp index f65c239968..e756722854 100644 --- a/src/mbgl/renderer/buckets/line_bucket.cpp +++ b/src/mbgl/renderer/buckets/line_bucket.cpp @@ -14,10 +14,7 @@ LineBucket::LineBucket(const style::LineLayoutProperties::PossiblyEvaluated layo const std::map<std::string, Immutable<style::LayerProperties>>& layerPaintProperties, const float zoom_, const uint32_t overscaling_) - : layout(std::move(layout_)), - zoom(zoom_), - overscaling(overscaling_) { - + : layout(layout_), zoom(zoom_), overscaling(overscaling_) { for (const auto& pair : layerPaintProperties) { paintPropertyBinders.emplace( std::piecewise_construct, diff --git a/src/mbgl/renderer/buckets/symbol_bucket.cpp b/src/mbgl/renderer/buckets/symbol_bucket.cpp index 5835dd9b86..03ab1c87d1 100644 --- a/src/mbgl/renderer/buckets/symbol_bucket.cpp +++ b/src/mbgl/renderer/buckets/symbol_bucket.cpp @@ -26,7 +26,7 @@ SymbolBucket::SymbolBucket(Immutable<style::SymbolLayoutProperties::PossiblyEval bool allowVerticalPlacement_, std::vector<style::TextWritingModeType> placementModes_) : layout(std::move(layout_)), - bucketLeaderID(std::move(bucketName_)), + bucketLeaderID(bucketName_), iconsNeedLinear(iconsNeedLinear_ || iconSize.isDataDriven() || !iconSize.isZoomConstant()), sortFeaturesByY(sortFeaturesByY_), staticUploaded(false), @@ -35,14 +35,13 @@ SymbolBucket::SymbolBucket(Immutable<style::SymbolLayoutProperties::PossiblyEval sortUploaded(false), justReloaded(false), hasVariablePlacement(false), - symbolInstances(std::move(symbolInstances_)), + symbolInstances(symbolInstances_), textSizeBinder(SymbolSizeBinder::create(zoom, textSize, TextSize::defaultValue())), iconSizeBinder(SymbolSizeBinder::create(zoom, iconSize, IconSize::defaultValue())), tilePixelRatio(tilePixelRatio_), bucketInstanceId(++maxBucketInstanceId), allowVerticalPlacement(allowVerticalPlacement_), placementModes(std::move(placementModes_)) { - for (const auto& pair : paintProperties_) { const auto& evaluated = getEvaluated<SymbolLayerProperties>(pair.second); paintProperties.emplace( diff --git a/src/mbgl/renderer/image_manager.cpp b/src/mbgl/renderer/image_manager.cpp index 4bbdbca5d9..d001084f92 100644 --- a/src/mbgl/renderer/image_manager.cpp +++ b/src/mbgl/renderer/image_manager.cpp @@ -124,7 +124,7 @@ void ImageManager::getImages(ImageRequestor& requestor, ImageRequestPair&& pair) requestors.emplace(&requestor, std::move(pair)); } } else { - checkMissingAndNotify(requestor, std::move(pair)); + checkMissingAndNotify(requestor, pair); } } diff --git a/src/mbgl/renderer/layers/render_symbol_layer.cpp b/src/mbgl/renderer/layers/render_symbol_layer.cpp index 06eacc041b..a4a73d3fe5 100644 --- a/src/mbgl/renderer/layers/render_symbol_layer.cpp +++ b/src/mbgl/renderer/layers/render_symbol_layer.cpp @@ -67,13 +67,13 @@ struct RenderableSegment { const LayerRenderData& renderData_, const SymbolBucket::PaintProperties& bucketPaintProperties_, float sortKey_, - const SymbolType type_) : - segment(std::move(segment_)), - tile(tile_), - renderData(renderData_), - bucketPaintProperties(bucketPaintProperties_), - sortKey(sortKey_), - type(type_) {} + const SymbolType type_) + : segment(segment_), + tile(tile_), + renderData(renderData_), + bucketPaintProperties(bucketPaintProperties_), + sortKey(sortKey_), + type(type_) {} SegmentWrapper segment; const RenderTile& tile; diff --git a/src/mbgl/renderer/property_evaluation_parameters.hpp b/src/mbgl/renderer/property_evaluation_parameters.hpp index 7c0d4e0fe2..59e96d7849 100644 --- a/src/mbgl/renderer/property_evaluation_parameters.hpp +++ b/src/mbgl/renderer/property_evaluation_parameters.hpp @@ -20,13 +20,8 @@ public: zoomHistory(), defaultFadeDuration(0) {} - PropertyEvaluationParameters(ZoomHistory zoomHistory_, - TimePoint now_, - Duration defaultFadeDuration_) - : z(zoomHistory_.lastZoom), - now(std::move(now_)), - zoomHistory(std::move(zoomHistory_)), - defaultFadeDuration(std::move(defaultFadeDuration_)) {} + PropertyEvaluationParameters(ZoomHistory zoomHistory_, TimePoint now_, Duration defaultFadeDuration_) + : z(zoomHistory_.lastZoom), now(now_), zoomHistory(zoomHistory_), defaultFadeDuration(defaultFadeDuration_) {} CrossfadeParameters getCrossfadeParameters() const { const float fraction = z - std::floor(z); diff --git a/src/mbgl/renderer/render_tile.cpp b/src/mbgl/renderer/render_tile.cpp index 0d63e5b265..70db10fa08 100644 --- a/src/mbgl/renderer/render_tile.cpp +++ b/src/mbgl/renderer/render_tile.cpp @@ -16,9 +16,7 @@ namespace mbgl { using namespace style; -RenderTile::RenderTile(UnwrappedTileID id_, Tile& tile_) - : id(std::move(id_)), tile(tile_) { -} +RenderTile::RenderTile(UnwrappedTileID id_, Tile& tile_) : id(id_), tile(tile_) {} RenderTile::~RenderTile() = default; diff --git a/src/mbgl/renderer/renderer.cpp b/src/mbgl/renderer/renderer.cpp index 916a12a95a..a74a21030e 100644 --- a/src/mbgl/renderer/renderer.cpp +++ b/src/mbgl/renderer/renderer.cpp @@ -8,13 +8,8 @@ namespace mbgl { -Renderer::Renderer(gfx::RendererBackend& backend, - float pixelRatio_, - const optional<std::string> localFontFamily_) - : impl(std::make_unique<Impl>(backend, - pixelRatio_, - std::move(localFontFamily_))) { -} +Renderer::Renderer(gfx::RendererBackend& backend, float pixelRatio_, const optional<std::string> localFontFamily_) + : impl(std::make_unique<Impl>(backend, pixelRatio_, localFontFamily_)) {} Renderer::~Renderer() { gfx::BackendScope guard { impl->backend }; |