Fix NPE in calcScale igreenwood#141

shtolik · Jul 9, 2021 · d3bf9c9 · d3bf9c9
1 parent bd12010
commit d3bf9c9
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/simplecropview/src/main/java/com/isseiaoki/simplecropview/CropImageView.java b/simplecropview/src/main/java/com/isseiaoki/simplecropview/CropImageView.java
@@ -539,8 +539,10 @@ private void setupLayout(int viewW, int viewH) {
   }
 
   private float calcScale(int viewW, int viewH, float angle) {
-    mImgWidth = getDrawable().getIntrinsicWidth();
-    mImgHeight = getDrawable().getIntrinsicHeight();
+    if (getDrawable() != null) {
+      mImgWidth = getDrawable().getIntrinsicWidth();
+      mImgHeight = getDrawable().getIntrinsicHeight();
+    }
     if (mImgWidth <= 0) mImgWidth = viewW;
     if (mImgHeight <= 0) mImgHeight = viewH;
     float viewRatio = (float) viewW / (float) viewH;