diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-24 17:15:37 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-25 13:15:09 +0200 |
commit | 067ff28d0ac5c35c399069457051e53f900696a0 (patch) | |
tree | 8b5f1e885739f7c269e64d46287e3a1833e300f9 /platform | |
parent | ee5be6dff1b106afa43fac6d714a40446144b667 (diff) | |
download | qtlocation-mapboxgl-067ff28d0ac5c35c399069457051e53f900696a0.tar.gz |
[core] ResoureOptions explicit copy via clone()
Diffstat (limited to 'platform')
-rw-r--r-- | platform/android/src/file_source.cpp | 2 | ||||
-rw-r--r-- | platform/default/src/mbgl/map/map_snapshotter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/platform/android/src/file_source.cpp b/platform/android/src/file_source.cpp index 94db563efc..41081cd0fb 100644 --- a/platform/android/src/file_source.cpp +++ b/platform/android/src/file_source.cpp @@ -120,7 +120,7 @@ FileSource* FileSource::getNativePeer(jni::JNIEnv& env, const jni::Object<FileSo mbgl::ResourceOptions FileSource::getSharedResourceOptions(jni::JNIEnv& env, const jni::Object<FileSource>& jFileSource) { FileSource* fileSource = FileSource::getNativePeer(env, jFileSource); assert(fileSource != nullptr); - return mbgl::ResourceOptions(fileSource->resourceOptions); + return fileSource->resourceOptions.clone(); } void FileSource::registerNative(jni::JNIEnv& env) { diff --git a/platform/default/src/mbgl/map/map_snapshotter.cpp b/platform/default/src/mbgl/map/map_snapshotter.cpp index cd8482e4ba..ca5eadafbc 100644 --- a/platform/default/src/mbgl/map/map_snapshotter.cpp +++ b/platform/default/src/mbgl/map/map_snapshotter.cpp @@ -174,7 +174,7 @@ MapSnapshotter::MapSnapshotter(std::shared_ptr<Scheduler> scheduler, const ResourceOptions& resourceOptions) : impl(std::make_unique<util::Thread<MapSnapshotter::Impl>>( "Map Snapshotter", std::move(scheduler), style, size, pixelRatio, cameraOptions, - region, programCacheDir, localFontFamily, resourceOptions)) {} + region, programCacheDir, localFontFamily, resourceOptions.clone())) {} MapSnapshotter::~MapSnapshotter() = default; |