tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Eliminate copies in deferred cleanup (#3035)

Browse Source
This commit is contained in:
Tim Sylvester
2025-02-07 10:48:16 -08:00
committed by GitHub
parent de8e34a19b
commit 14559245d8
79 changed files with 346 additions and 292 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
platform/android/MapLibreAndroid/src/cpp/file_source.cpp
View File

@@ -30,13 +30,13 @@ FileSource::FileSource(jni::JNIEnv& _env,
mbgl::FileSourceManager::get()->registerFileSourceFactory(
mbgl::FileSourceType::Asset,
[](const mbgl::ResourceOptions& resourceOptions, const mbgl::ClientOptions& clientOptions) {
[](const mbgl::ResourceOptions& resourceOptions_, const mbgl::ClientOptions& clientOptions_) {
auto env{android::AttachEnv()};
std::unique_ptr<mbgl::FileSource> assetFileSource;
if (android::MapLibre::hasInstance(*env)) {
auto assetManager = android::MapLibre::getAssetManager(*env);
assetFileSource = std::make_unique<AssetManagerFileSource>(
*env, assetManager, resourceOptions.clone(), clientOptions.clone());
*env, assetManager, resourceOptions_.clone(), clientOptions_.clone());
}
return assetFileSource;
});
@@ -161,7 +161,7 @@ void FileSource::setResourceCachePath(jni::JNIEnv& env,
pathChangeCallback = {};
});
databaseSource->setDatabasePath(newPath + DATABASE_FILE, pathChangeCallback);
databaseSource->setDatabasePath(newPath + DATABASE_FILE, std::move(pathChangeCallback));
}
void FileSource::resume(jni::JNIEnv&) {