From 13b91aab39481eb708a580a87d7118c6180d0e23 Mon Sep 17 00:00:00 2001
From: Mikael Sand <msand@abo.fi>
Date: Mon, 22 Oct 2018 16:28:22 +0300
Subject: [PATCH] [android] Add null checks before calling Matrix.mapRect

---
 android/src/main/java/com/horcrux/svg/GroupView.java | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/android/src/main/java/com/horcrux/svg/GroupView.java b/android/src/main/java/com/horcrux/svg/GroupView.java
index 9f5cb5d0..b7fc9b69 100644
--- a/android/src/main/java/com/horcrux/svg/GroupView.java
+++ b/android/src/main/java/com/horcrux/svg/GroupView.java
@@ -43,8 +43,12 @@ class GroupView extends RenderableView {
 
     void setupGlyphContext(Canvas canvas) {
         RectF clipBounds = new RectF(canvas.getClipBounds());
-        mMatrix.mapRect(clipBounds);
-        mTransform.mapRect(clipBounds);
+        if (mMatrix != null) {
+            mMatrix.mapRect(clipBounds);
+        }
+        if (mTransform != null) {
+            mTransform.mapRect(clipBounds);
+        }
         mGlyphContext = new GlyphContext(mScale, clipBounds.width(), clipBounds.height());
     }
 
@@ -171,7 +175,9 @@ class GroupView extends RenderableView {
                     } else {
                         p2 = n.getPath(canvas, paint);
                     }
-                    p2.transform(transform);
+                    if (transform != null) {
+                        p2.transform(transform);
+                    }
                     Region r2 = new Region();
                     r2.setPath(p2, bounds);
                     r.op(r2, op);