diff --git a/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp index 5ebbbf516..d7b5b6e96 100644 --- a/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.cpp @@ -60,7 +60,7 @@ AssetManagerFileSource::AssetManagerFileSource(jni::JNIEnv& env, const jni::Object& assetManager_, const ResourceOptions resourceOptions, const ClientOptions clientOptions) - : assetManager(jni::NewGlobal(env, assetManager_)), + : assetManager(jni::NewGlobal(env, assetManager_)), impl(std::make_unique>( util::makeThreadPrioritySetter(platform::EXPERIMENTAL_THREAD_PRIORITY_FILE), "AssetManagerFileSource", diff --git a/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp index 79202d494..166fc0398 100644 --- a/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/asset_manager_file_source.hpp @@ -35,7 +35,7 @@ public: private: class Impl; - jni::Global> assetManager; + jni::Global, jni::EnvAttachingDeleter> assetManager; std::unique_ptr> impl; }; diff --git a/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp index c72325a5f..678942770 100644 --- a/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp +++ b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer.cpp @@ -39,7 +39,7 @@ LocalGlyphRasterizer::LocalGlyphRasterizer() { static auto& javaClass = jni::Class::Singleton(*env); static auto constructor = javaClass.GetConstructor(*env); - javaObject = jni::NewGlobal(*env, javaClass.New(*env, constructor)); + javaObject = jni::NewGlobal(*env, javaClass.New(*env, constructor)); } PremultipliedImage LocalGlyphRasterizer::drawGlyphBitmap(const std::string& fontFamily, diff --git a/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp index 5d0a77998..d48a69d5e 100644 --- a/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp +++ b/platform/android/MapLibreAndroid/src/cpp/text/local_glyph_rasterizer_jni.hpp @@ -26,7 +26,7 @@ public: PremultipliedImage drawGlyphBitmap(const std::string& fontFamily, const bool bold, const char16_t glyphID); private: - jni::Global> javaObject; + jni::Global, jni::EnvAttachingDeleter> javaObject; }; } // namespace android