From e99c41c0c76da3856e1f7cb7ca9de6156735b2ab Mon Sep 17 00:00:00 2001
From: Florens Douwes <Floens@gmail.com>
Date: Thu, 21 Aug 2014 13:10:45 +0200
Subject: [PATCH] Catch OutOfMemoryError in SSIV tile decoder.

---
 .../labs/subscaleview/SubsamplingScaleImageView.java        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Clover/app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java b/Clover/app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
index 3fd68325..72dc5bfa 100644
--- a/Clover/app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
+++ b/Clover/app/src/main/java/com/davemorrissey/labs/subscaleview/SubsamplingScaleImageView.java
@@ -1025,6 +1025,9 @@ public class SubsamplingScaleImageView extends View {
                 }
             } catch (Exception e) {
                 Log.e(TAG, "Failed to initialise bitmap decoder", e);
+            } catch (OutOfMemoryError e) {
+                Log.e(TAG, "OOM in decode tile", e);
+                System.gc();
             }
             return null;
         }
@@ -1086,6 +1089,9 @@ public class SubsamplingScaleImageView extends View {
                 }
             } catch (Exception e) {
                 Log.e(TAG, "Failed to decode tile", e);
+            } catch (OutOfMemoryError e) {
+                Log.e(TAG, "OOM in decode tile", e);
+                System.gc();
             }
             return null;
         }