Merge branch 'dev'

daishengda2018 · daishengda2018 · commit b060ce88c784 · 2020-07-09T11:45:56.000+08:00
diff --git a/library/src/main/java/com/opensource/svgaplayer/bitmap/BitmapSampleSizeCalculator.kt b/library/src/main/java/com/opensource/svgaplayer/bitmap/BitmapSampleSizeCalculator.kt
@@ -1,19 +1,17 @@
-package com.opensource.svgaplayer.utils
+package com.opensource.svgaplayer.bitmap
 
 import android.graphics.BitmapFactory
-import android.util.Log
 
 /**
  *
  * Create by im_dsd 2020/7/7 17:59
  */
-internal object BitmapUtils {
+internal object BitmapSampleSizeCalculator {
 
-    fun calculateInSampleSize(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
+    fun calculate(options: BitmapFactory.Options, reqWidth: Int, reqHeight: Int): Int {
         // Raw height and width of image
         val (height: Int, width: Int) = options.run { outHeight to outWidth }
         var inSampleSize = 1
-        Log.d("##SVGA","## calculateInSampleSize  $reqWidth $reqHeight $width $height")
 
         if (reqHeight <= 0 || reqWidth <= 0) {
             return inSampleSize
diff --git a/library/src/main/java/com/opensource/svgaplayer/bitmap/SVGABitmapDecoder.kt b/library/src/main/java/com/opensource/svgaplayer/bitmap/SVGABitmapDecoder.kt
@@ -2,8 +2,6 @@ package com.opensource.svgaplayer.bitmap
 
 import android.graphics.Bitmap
 import android.graphics.BitmapFactory
-import android.util.Log
-import com.opensource.svgaplayer.utils.BitmapUtils
 
 /**
  * Bitmap 解码器
@@ -26,8 +24,7 @@ internal abstract class SVGABitmapDecoder<T> {
             }
 
             // Calculate inSampleSize
-            inSampleSize = BitmapUtils.calculateInSampleSize(this, reqWidth, reqHeight)
-            Log.d("##SVGA","## SVGABitmapDecoder inSampleSize $inSampleSize")
+            inSampleSize = BitmapSampleSizeCalculator.calculate(this, reqWidth, reqHeight)
             // Decode bitmap with inSampleSize set
             inJustDecodeBounds = false
             onDecode(data, this)
