diff options
| author | Neil Fuller <nfuller@google.com> | 2014-10-02 11:48:08 +0100 |
|---|---|---|
| committer | Neil Fuller <nfuller@google.com> | 2014-10-02 11:48:08 +0100 |
| commit | f7cf5d43aa13405f9d0dd54f6038f710a0423323 (patch) | |
| tree | 76f33c6e39a9ca49ff9c1d9d776cb86115bc7ff3 /graphics/java | |
| parent | 92c414724f84e32df3c0f79ce11e37ef3d481611 (diff) | |
| parent | ee665151a4c6359cbfbb9a6795aa9097c4622083 (diff) | |
| download | frameworks_base-f7cf5d43aa13405f9d0dd54f6038f710a0423323.zip frameworks_base-f7cf5d43aa13405f9d0dd54f6038f710a0423323.tar.gz frameworks_base-f7cf5d43aa13405f9d0dd54f6038f710a0423323.tar.bz2 | |
resolved conflicts for merge of ee665151 to lmp-dev-plus-aosp
Change-Id: I97671e62de26919e391dbb2686511584c59ab990
Diffstat (limited to 'graphics/java')
| -rw-r--r-- | graphics/java/android/graphics/ColorMatrix.java | 8 | ||||
| -rw-r--r-- | graphics/java/android/graphics/PointF.java | 3 | ||||
| -rw-r--r-- | graphics/java/android/graphics/RectF.java | 5 |
3 files changed, 6 insertions, 10 deletions
diff --git a/graphics/java/android/graphics/ColorMatrix.java b/graphics/java/android/graphics/ColorMatrix.java index 1242eb5..f73abcb 100644 --- a/graphics/java/android/graphics/ColorMatrix.java +++ b/graphics/java/android/graphics/ColorMatrix.java @@ -16,8 +16,6 @@ package android.graphics; -import android.util.FloatMath; - import java.util.Arrays; /** @@ -123,9 +121,9 @@ public class ColorMatrix { */ public void setRotate(int axis, float degrees) { reset(); - float radians = degrees * (float)Math.PI / 180; - float cosine = FloatMath.cos(radians); - float sine = FloatMath.sin(radians); + double radians = degrees * Math.PI / 180d; + float cosine = (float) Math.cos(radians); + float sine = (float) Math.sin(radians); switch (axis) { // Rotation around the red color case 0: diff --git a/graphics/java/android/graphics/PointF.java b/graphics/java/android/graphics/PointF.java index ee38dbb..8e4288e 100644 --- a/graphics/java/android/graphics/PointF.java +++ b/graphics/java/android/graphics/PointF.java @@ -18,7 +18,6 @@ package android.graphics; import android.os.Parcel; import android.os.Parcelable; -import android.util.FloatMath; /** @@ -109,7 +108,7 @@ public class PointF implements Parcelable { * Returns the euclidian distance from (0,0) to (x,y) */ public static float length(float x, float y) { - return FloatMath.sqrt(x * x + y * y); + return (float) Math.hypot(x, y); } /** diff --git a/graphics/java/android/graphics/RectF.java b/graphics/java/android/graphics/RectF.java index 53178b0..f5cedfa 100644 --- a/graphics/java/android/graphics/RectF.java +++ b/graphics/java/android/graphics/RectF.java @@ -20,7 +20,6 @@ import java.io.PrintWriter; import android.os.Parcel; import android.os.Parcelable; -import android.util.FloatMath; import com.android.internal.util.FastMath; /** @@ -450,8 +449,8 @@ public class RectF implements Parcelable { * floor of top and left, and the ceiling of right and bottom. */ public void roundOut(Rect dst) { - dst.set((int) FloatMath.floor(left), (int) FloatMath.floor(top), - (int) FloatMath.ceil(right), (int) FloatMath.ceil(bottom)); + dst.set((int) Math.floor(left), (int) Math.floor(top), + (int) Math.ceil(right), (int) Math.ceil(bottom)); } /** |