Merge pull request #81 from koush/master

BitmapDrawable with a null Bitmap is valid/legal
vinc3m1 · Mar 5, 2015 · d49aa62 · d49aa62
2 parents 00bd0c4 + a683859
commit d49aa62
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/roundedimageview/src/main/java/com/makeramen/roundedimageview/RoundedDrawable.java b/roundedimageview/src/main/java/com/makeramen/roundedimageview/RoundedDrawable.java
@@ -110,8 +110,6 @@ public static Drawable fromDrawable(Drawable drawable) {
       Bitmap bm = drawableToBitmap(drawable);
       if (bm != null) {
         return new RoundedDrawable(bm);
-      } else {
-        Log.w(TAG, "Failed to create bitmap from drawable!");
       }
     }
     return drawable;
@@ -132,6 +130,7 @@ public static Bitmap drawableToBitmap(Drawable drawable) {
       drawable.draw(canvas);
     } catch (Exception e) {
       e.printStackTrace();
+      Log.w(TAG, "Failed to create bitmap from drawable!");
       bitmap = null;
     }