[android] release local refs early

mapbox · Apr 9, 2018 · 14423a2 · 14423a2
1 parent 1af1cbe
commit 14423a2
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/platform/android/src/image.cpp b/platform/android/src/image.cpp
@@ -16,7 +16,12 @@ PremultipliedImage decodeImage(const std::string& string) {
                         reinterpret_cast<const signed char*>(string.data()));
 
     auto bitmap = android::BitmapFactory::DecodeByteArray(*env, array, 0, string.size());
-    return android::Bitmap::GetImage(*env, bitmap);
+    jni::DeleteLocalRef(*env, array);
+
+    auto image = android::Bitmap::GetImage(*env, bitmap);
+    jni::DeleteLocalRef(*env, bitmap);
+
+    return image;
 }
 
 } // namespace mbgl
diff --git a/platform/android/src/text/local_glyph_rasterizer.cpp b/platform/android/src/text/local_glyph_rasterizer.cpp
@@ -46,6 +46,7 @@ PremultipliedImage LocalGlyphRasterizer::drawGlyphBitmap(const std::string& font
                                      jniFontFamily,
                                      static_cast<jni::jboolean>(bold),
                                      static_cast<jni::jchar>(glyphID));
+    jni::DeleteLocalRef(*env, jniFontFamily);
 
     PremultipliedImage result = Bitmap::GetImage(*env, javaBitmap);
     jni::DeleteLocalRef(*env, javaBitmap);