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 /media/mca | |
| 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 'media/mca')
| -rw-r--r-- | media/mca/filterfw/java/android/filterfw/geometry/Point.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/mca/filterfw/java/android/filterfw/geometry/Point.java b/media/mca/filterfw/java/android/filterfw/geometry/Point.java index 8207c72c..4682a0d 100644 --- a/media/mca/filterfw/java/android/filterfw/geometry/Point.java +++ b/media/mca/filterfw/java/android/filterfw/geometry/Point.java @@ -70,7 +70,7 @@ public class Point { } public float length() { - return (float)Math.sqrt(x*x + y*y); + return (float)Math.hypot(x, y); } public float distanceTo(Point p) { |