drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am c7aa8fe6: Merge "Removing some more FloatMath references"

Browse Source 
* commit 'c7aa8fe62356fc09962941140c8bb7ed8bab2f8f':
  Removing some more FloatMath references
This commit is contained in:
Neil Fuller
2014-10-17 14:54:17 +00:00
committed by Android Git Automerger
parent b973422804 c7aa8fe623
commit 9b0109eb05
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/gesture/GestureStroke.java
View File

@ -69,7 +69,7 @@ public class GestureStroke {
bx.bottom = p.y; bx.bottom = p.y;
len = 0; len = 0;
} else { } else {
len += Math.hypot(p.x - tmpPoints[(i - 1) * 2], p.y - tmpPoints[(i -1 ) * 2 + 1]); len += Math.hypot(p.x - tmpPoints[(i - 1) * 2], p.y - tmpPoints[(i -1) * 2 + 1]);
bx.union(p.x, p.y); bx.union(p.x, p.y);
} }
index++; index++;

7
packages/WallpaperCropper/src/com/android/gallery3d/common/BitmapUtils.java
View File

@ -23,7 +23,6 @@ import android.graphics.Canvas;
import android.graphics.Matrix; import android.graphics.Matrix;
import android.graphics.Paint; import android.graphics.Paint;
import android.os.Build; import android.os.Build;
import android.util.FloatMath;
import android.util.Log; import android.util.Log;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
@ -72,7 +71,7 @@ public class BitmapUtils {
&& minSideLength == UNCONSTRAINED) return 1; && minSideLength == UNCONSTRAINED) return 1;
int lowerBound = (maxNumOfPixels == UNCONSTRAINED) ? 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) { if (minSideLength == UNCONSTRAINED) {
return lowerBound; return lowerBound;
@ -96,7 +95,7 @@ public class BitmapUtils {
// Find the min x that 1 / x >= scale // Find the min x that 1 / x >= scale
public static int computeSampleSizeLarger(float scale) { public static int computeSampleSizeLarger(float scale) {
int initialSize = (int) FloatMath.floor(1f / scale); int initialSize = (int) Math.floor(1 / scale);
if (initialSize <= 1) return 1; if (initialSize <= 1) return 1;
return initialSize <= 8 return initialSize <= 8
@ -107,7 +106,7 @@ public class BitmapUtils {
// Find the max x that 1 / x <= scale. // Find the max x that 1 / x <= scale.
public static int computeSampleSize(float scale) { public static int computeSampleSize(float scale) {
Utils.assertTrue(scale > 0); 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 return initialSize <= 8
? Utils.nextPowerOf2(initialSize) ? Utils.nextPowerOf2(initialSize)
: (initialSize + 7) / 8 * 8; : (initialSize + 7) / 8 * 8;