diff options
| author | Lauren Budorick <lauren@mapbox.com> | 2017-04-20 14:10:22 -0700 |
|---|---|---|
| committer | Lauren Budorick <lauren@mapbox.com> | 2017-04-24 17:11:02 -0700 |
| commit | 90c022970238648a0cc8e3cbfdace55e7c3692e5 (patch) | |
| tree | c1f8e8e9b2ff160f92ffe5532118e71c066fe252 | |
| parent | 177bb2746544ff420690d5bbcc97e28ba2517a66 (diff) | |
| download | qtlocation-mapboxgl-90c022970238648a0cc8e3cbfdace55e7c3692e5.tar.gz | |
Return regular ptr from Map#getLight
| -rw-r--r-- | include/mbgl/map/map.hpp | 2 | ||||
| -rw-r--r-- | src/mbgl/map/map.cpp | 4 | ||||
| -rw-r--r-- | src/mbgl/style/light_impl.hpp | 6 | ||||
| -rw-r--r-- | src/mbgl/style/style.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 3cb16e1ddf..84ea3104d8 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -182,7 +182,7 @@ public: // Light void setLight(std::unique_ptr<style::Light>); - std::unique_ptr<style::Light> getLight(); + style::Light* getLight(); // Defaults std::string getStyleName() const; diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 17d1c5fa77..b5a1af172a 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -987,12 +987,12 @@ void Map::setLight(std::unique_ptr<style::Light> light) { impl->style->light = std::move(light); } -std::unique_ptr<style::Light> Map::getLight() { +style::Light* Map::getLight() { if (!impl->style) { return nullptr; } - return std::move(impl->style->light); + return impl->style->light.get(); } #pragma mark - Defaults diff --git a/src/mbgl/style/light_impl.hpp b/src/mbgl/style/light_impl.hpp index 7886b61291..d1825090fc 100644 --- a/src/mbgl/style/light_impl.hpp +++ b/src/mbgl/style/light_impl.hpp @@ -27,12 +27,12 @@ private: public: Transitioning() = default; - Transitioning(const Raw* raw, Transitioning&& prior, const CascadeParameters& params) + Transitioning(const Raw& raw, Transitioning&& prior, const CascadeParameters& params) : Super { TransitioningProperty<typename Ps::ValueType>( - raw->template get<Ps>().value, + raw.template get<Ps>().value, std::move(prior.template get<Ps>()), - raw->template get<Ps>().transition.reverseMerge(params.transition), + raw.template get<Ps>().transition.reverseMerge(params.transition), params.now)... } {} diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index 9ea8d82e6a..200aad7ec0 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -310,7 +310,7 @@ void Style::cascade(const TimePoint& timePoint, MapMode mode) { layer->baseImpl->cascade(parameters); } - transitioningLight = TransitioningLight(light.get(), std::move(transitioningLight), parameters); + transitioningLight = TransitioningLight(*light, std::move(transitioningLight), parameters); } void Style::recalculate(float z, const TimePoint& timePoint, MapMode mode) { |