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 12:09:09 +0200 |
commit | d15b9c1f9c1afa29175ba2e398adc680e66147e6 (patch) | |
tree | 6bf426ae77d7386a6bbdee30444974bbc5dd76d0 /src/mbgl/map | |
parent | 37802eec36aae3cb84c7f73a48652d9959489243 (diff) | |
download | qtlocation-mapboxgl-d15b9c1f9c1afa29175ba2e398adc680e66147e6.tar.gz |
[core] Fix performance-unnecessary-value-param errors
As reported by clang-tidy-8.
Diffstat (limited to 'src/mbgl/map')
-rw-r--r-- | src/mbgl/map/map.cpp | 37 | ||||
-rw-r--r-- | src/mbgl/map/transform.cpp | 7 | ||||
-rw-r--r-- | src/mbgl/map/transform.hpp | 7 | ||||
-rw-r--r-- | src/mbgl/map/transform_state.cpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/transform_state.hpp | 2 |
5 files changed, 35 insertions, 20 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 7e72595149..eda16160ae 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -128,7 +128,7 @@ bool Map::isPanning() const { #pragma mark - -CameraOptions Map::getCameraOptions(optional<EdgeInsets> padding) const { +CameraOptions Map::getCameraOptions(const optional<EdgeInsets>& padding) const { return impl->transform.getCameraOptions(padding); } @@ -158,7 +158,7 @@ void Map::pitchBy(double pitch, const AnimationOptions& animation) { easeTo(CameraOptions().withPitch((impl->transform.getPitch() * util::RAD2DEG) - pitch), animation); } -void Map::scaleBy(double scale, optional<ScreenCoordinate> anchor, const AnimationOptions& animation) { +void Map::scaleBy(double scale, const optional<ScreenCoordinate>& anchor, const AnimationOptions& animation) { const double zoom = impl->transform.getZoom() + impl->transform.getState().scaleZoom(scale); easeTo(CameraOptions().withZoom(zoom).withAnchor(anchor), animation); } @@ -169,13 +169,20 @@ void Map::rotateBy(const ScreenCoordinate& first, const ScreenCoordinate& second impl->onUpdate(); } -CameraOptions Map::cameraForLatLngBounds(const LatLngBounds& bounds, const EdgeInsets& padding, optional<double> bearing, optional<double> pitch) const { - return cameraForLatLngs({ - bounds.northwest(), - bounds.southwest(), - bounds.southeast(), - bounds.northeast(), - }, padding, bearing, pitch); +CameraOptions Map::cameraForLatLngBounds(const LatLngBounds& bounds, + const EdgeInsets& padding, + const optional<double>& bearing, + const optional<double>& pitch) const { + return cameraForLatLngs( + { + bounds.northwest(), + bounds.southwest(), + bounds.southeast(), + bounds.northeast(), + }, + padding, + bearing, + pitch); } CameraOptions cameraForLatLngs(const std::vector<LatLng>& latLngs, const Transform& transform, const EdgeInsets& padding) { @@ -223,8 +230,10 @@ CameraOptions cameraForLatLngs(const std::vector<LatLng>& latLngs, const Transfo .withZoom(zoom); } -CameraOptions Map::cameraForLatLngs(const std::vector<LatLng>& latLngs, const EdgeInsets& padding, optional<double> bearing, optional<double> pitch) const { - +CameraOptions Map::cameraForLatLngs(const std::vector<LatLng>& latLngs, + const EdgeInsets& padding, + const optional<double>& bearing, + const optional<double>& pitch) const { if (!bearing && !pitch) { return mbgl::cameraForLatLngs(latLngs, impl->transform, padding); } @@ -240,8 +249,10 @@ CameraOptions Map::cameraForLatLngs(const std::vector<LatLng>& latLngs, const Ed .withPitch(transform.getPitch() * util::RAD2DEG); } -CameraOptions Map::cameraForGeometry(const Geometry<double>& geometry, const EdgeInsets& padding, optional<double> bearing, optional<double> pitch) const { - +CameraOptions Map::cameraForGeometry(const Geometry<double>& geometry, + const EdgeInsets& padding, + const optional<double>& bearing, + const optional<double>& pitch) const { std::vector<LatLng> latLngs; forEachPoint(geometry, [&](const Point<double>& pt) { latLngs.emplace_back(pt.y, pt.x); diff --git a/src/mbgl/map/transform.cpp b/src/mbgl/map/transform.cpp index b40456ebdc..3e3584e5ba 100644 --- a/src/mbgl/map/transform.cpp +++ b/src/mbgl/map/transform.cpp @@ -11,8 +11,9 @@ #include <mbgl/util/logging.hpp> #include <mbgl/util/platform.hpp> -#include <cstdio> #include <cmath> +#include <cstdio> +#include <utility> namespace mbgl { @@ -66,7 +67,7 @@ void Transform::resize(const Size size) { #pragma mark - Camera -CameraOptions Transform::getCameraOptions(optional<EdgeInsets> padding) const { +CameraOptions Transform::getCameraOptions(const optional<EdgeInsets>& padding) const { return state.getCameraOptions(padding); } @@ -491,7 +492,7 @@ ProjectionMode Transform::getProjectionMode() const { void Transform::startTransition(const CameraOptions& camera, const AnimationOptions& animation, - std::function<void(double)> frame, + const std::function<void(double)>& frame, const Duration& duration) { if (transitionFinishFn) { transitionFinishFn(); diff --git a/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp index 3f815fa3f1..38fb302b7b 100644 --- a/src/mbgl/map/transform.hpp +++ b/src/mbgl/map/transform.hpp @@ -29,7 +29,7 @@ public: // Camera /** Returns the current camera options. */ - CameraOptions getCameraOptions(optional<EdgeInsets>) const; + CameraOptions getCameraOptions(const optional<EdgeInsets>&) const; /** Instantaneously, synchronously applies the given camera options. */ void jumpTo(const CameraOptions&); @@ -117,7 +117,10 @@ private: MapObserver& observer; TransformState state; - void startTransition(const CameraOptions&, const AnimationOptions&, std::function<void(double)>, const Duration&); + void startTransition(const CameraOptions&, + const AnimationOptions&, + const std::function<void(double)>&, + const Duration&); // We don't want to show horizon: limit max pitch based on edge insets. double getMaxPitchForEdgeInsets(const EdgeInsets &insets) const; diff --git a/src/mbgl/map/transform_state.cpp b/src/mbgl/map/transform_state.cpp index da21487d67..8e297ae8cf 100644 --- a/src/mbgl/map/transform_state.cpp +++ b/src/mbgl/map/transform_state.cpp @@ -255,7 +255,7 @@ void TransformState::setViewportMode(ViewportMode val) { #pragma mark - Camera options -CameraOptions TransformState::getCameraOptions(optional<EdgeInsets> padding) const { +CameraOptions TransformState::getCameraOptions(const optional<EdgeInsets>& padding) const { return CameraOptions() .withCenter(getLatLng()) .withPadding(padding ? padding : edgeInsets) diff --git a/src/mbgl/map/transform_state.hpp b/src/mbgl/map/transform_state.hpp index 183400d417..b7fa97eea6 100644 --- a/src/mbgl/map/transform_state.hpp +++ b/src/mbgl/map/transform_state.hpp @@ -130,7 +130,7 @@ public: ViewportMode getViewportMode() const; void setViewportMode(ViewportMode val); - CameraOptions getCameraOptions(optional<EdgeInsets>) const; + CameraOptions getCameraOptions(const optional<EdgeInsets>&) const; // EdgeInsects EdgeInsets getEdgeInsets() const { return edgeInsets; } |