diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2017-02-28 02:45:13 +0200 |
---|---|---|
committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2017-02-28 09:33:04 -0800 |
commit | 609cdb0fd7b569dade2c3148f21024f280636154 (patch) | |
tree | 3e18523f629ed299ed9f6f84e8c4129e6d99fdd2 /platform/android/src/style/layers/layer.cpp | |
parent | f0de56cffae4922db80c74f751f14ac3ed572b31 (diff) | |
download | qtlocation-mapboxgl-609cdb0fd7b569dade2c3148f21024f280636154.tar.gz |
[android] fix ownership of style layer after delete
Diffstat (limited to 'platform/android/src/style/layers/layer.cpp')
-rw-r--r-- | platform/android/src/style/layers/layer.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index bfc09be302..dbf71fd2af 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -26,9 +26,22 @@ namespace android { , layer(*ownedLayer) { } + /** + * Takes a non-owning reference. For lookup methods + */ Layer::Layer(mbgl::Map& coreMap, mbgl::style::Layer& coreLayer) : layer(coreLayer) , map(&coreMap) { } + /** + * Takes a owning reference. Ownership is transfered to this peer, eg after removing + * from the map + */ + Layer::Layer(mbgl::Map& coreMap, std::unique_ptr<mbgl::style::Layer> coreLayer) + : ownedLayer(std::move(coreLayer)) + , layer(*ownedLayer) + , map(&coreMap) { + } + Layer::~Layer() { } |