diff options
author | Andreas Gampe <agampe@google.com> | 2018-01-23 17:02:57 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2018-01-23 17:02:57 +0000 |
commit | 9e29df9dd43d0c8e4430b7b27f4990974cab4cbb (patch) | |
tree | 0e3f333d3f1f27b987a18336ec01c0b5103e224b | |
parent | 0d9941f3db35f9eeddd51f8a26e2a13ef41da4a0 (diff) | |
parent | 9ac972e9bcaa0409a83d7de59ac364ddde7c0d5f (diff) | |
download | android_packages_apps_Gallery2-9e29df9dd43d0c8e4430b7b27f4990974cab4cbb.tar.gz android_packages_apps_Gallery2-9e29df9dd43d0c8e4430b7b27f4990974cab4cbb.tar.bz2 android_packages_apps_Gallery2-9e29df9dd43d0c8e4430b7b27f4990974cab4cbb.zip |
Merge "Gallery2: Fix NaN comparisons" am: 6f8c54d224
am: 9ac972e9bc
Change-Id: I081c00f5e57adc883be2a1e8478cfa467d49166c
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java | 2 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java index d316adeed..512594f5a 100644 --- a/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java +++ b/src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java @@ -151,7 +151,7 @@ public class FilterVignetteRepresentation extends FilterRepresentation implement } public boolean isCenterSet() { - return mCenterX != Float.NaN; + return !Float.isNaN(mCenterX); } @Override diff --git a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java index b94e52e48..06fc1dce1 100644 --- a/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java +++ b/src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java @@ -189,7 +189,7 @@ public class EclipseControl { } public void paintGrayPoint(Canvas canvas, float x, float y) { - if (x == Float.NaN) { + if (Float.isNaN(x)) { return; } @@ -206,7 +206,7 @@ public class EclipseControl { } public void paintPoint(Canvas canvas, float x, float y) { - if (x == Float.NaN) { + if (Float.isNaN(x)) { return; } @@ -223,7 +223,7 @@ public class EclipseControl { } void paintRadius(Canvas canvas, float cx, float cy, float rx, float ry) { - if (cx == Float.NaN) { + if (Float.isNaN(cx)) { return; } int mSliderColor = 0xFF33B5E5; |