diff options
author | Chih-Chung Chang <chihchung@google.com> | 2012-02-10 17:08:58 -0800 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-10 17:08:58 -0800 |
commit | fa0c5fdbb402442fe8a39ecacb994a8be2750d68 (patch) | |
tree | 28f480dbcb1e298bc30104f920f4fafe4d65c6d0 /gallerycommon/src/com/android | |
parent | 1173fd0aa3f8fcd5fedbf790a996619a3cbf11f5 (diff) | |
download | android_packages_apps_Snap-fa0c5fdbb402442fe8a39ecacb994a8be2750d68.tar.gz android_packages_apps_Snap-fa0c5fdbb402442fe8a39ecacb994a8be2750d68.tar.bz2 android_packages_apps_Snap-fa0c5fdbb402442fe8a39ecacb994a8be2750d68.zip |
Revert "Use FloatMath instead of Math."
This reverts commit 6bb8b2eb8695c042798f0eb798032cd30d642a65
Diffstat (limited to 'gallerycommon/src/com/android')
-rw-r--r-- | gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java index 67aa6d77b..2192cf8ec 100644 --- a/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java +++ b/gallerycommon/src/com/android/gallery3d/common/BitmapUtils.java @@ -23,7 +23,6 @@ import android.graphics.Canvas; import android.graphics.Matrix; import android.graphics.Paint; import android.os.Build; -import android.util.FloatMath; import android.util.Log; import java.io.ByteArrayOutputStream; @@ -72,7 +71,7 @@ public class BitmapUtils { && minSideLength == UNCONSTRAINED) return 1; int lowerBound = (maxNumOfPixels == UNCONSTRAINED) ? 1 : - (int) FloatMath.ceil(FloatMath.sqrt((float) (w * h) / maxNumOfPixels)); + (int) Math.ceil(Math.sqrt((double) (w * h) / maxNumOfPixels)); if (minSideLength == UNCONSTRAINED) { return lowerBound; @@ -96,7 +95,7 @@ public class BitmapUtils { // Fin the min x that 1 / x <= scale public static int computeSampleSizeLarger(float scale) { - int initialSize = (int) FloatMath.floor(1f / scale); + int initialSize = (int) Math.floor(1f / scale); if (initialSize <= 1) return 1; return initialSize <= 8 @@ -107,7 +106,7 @@ public class BitmapUtils { // Find the max x that 1 / x >= scale. public static int computeSampleSize(float scale) { Utils.assertTrue(scale > 0); - int initialSize = Math.max(1, (int) FloatMath.ceil(1 / scale)); + int initialSize = Math.max(1, (int) Math.ceil(1 / scale)); return initialSize <= 8 ? Utils.nextPowerOf2(initialSize) : (initialSize + 7) / 8 * 8; @@ -117,7 +116,8 @@ public class BitmapUtils { Bitmap bitmap, int targetPixels, boolean recycle) { int width = bitmap.getWidth(); int height = bitmap.getHeight(); - float scale = FloatMath.sqrt((float) targetPixels / (width * height)); + float scale = (float) Math.sqrt( + (double) targetPixels / (width * height)); if (scale >= 1.0f) return bitmap; return resizeBitmapByScale(bitmap, scale, recycle); } |