davemorrissey#128 Close inputstream after decoding bitmap

weikipeng · Oct 13, 2015 · fc7ce78 · fc7ce78
1 parent 7d42d6c
commit fc7ce78
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/library/src/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java b/library/src/com/davemorrissey/labs/subscaleview/decoder/SkiaImageDecoder.java
@@ -9,6 +9,7 @@
 import android.net.Uri;
 import android.text.TextUtils;
 
+import java.io.InputStream;
 import java.util.List;
 
 /**
@@ -59,8 +60,16 @@ public Bitmap decode(Context context, Uri uri) throws Exception {
         } else if (uriString.startsWith(FILE_PREFIX)) {
             bitmap = BitmapFactory.decodeFile(uriString.substring(FILE_PREFIX.length()), options);
         } else {
-            ContentResolver contentResolver = context.getContentResolver();
-            bitmap = BitmapFactory.decodeStream(contentResolver.openInputStream(uri), null, options);
+            InputStream inputStream = null;
+            try {
+                ContentResolver contentResolver = context.getContentResolver();
+                inputStream = contentResolver.openInputStream(uri);
+                bitmap = BitmapFactory.decodeStream(inputStream, null, options);
+            } finally {
+                if (inputStream != null) {
+                    try { inputStream.close(); } catch (Exception e) { }
+                }
+            }
         }
         if (bitmap == null) {
             throw new RuntimeException("Skia image region decoder returned null bitmap - image format may not be supported");