summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2018-01-24 08:21:11 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2018-01-24 08:21:11 +0000
commitba5afec49b155de8c8cde0b87b4f7baf11fe5f4f (patch)
treef7112655a78c2b2a1a40a5eec44d7676ffd5614e
parent3577ea89af10a86befd4f994eb0e3dc475a23905 (diff)
parenta57d161c2e3eafeb0062c065f8185d0464f7f988 (diff)
downloadandroid_packages_apps_Gallery2-ba5afec49b155de8c8cde0b87b4f7baf11fe5f4f.tar.gz
android_packages_apps_Gallery2-ba5afec49b155de8c8cde0b87b4f7baf11fe5f4f.tar.bz2
android_packages_apps_Gallery2-ba5afec49b155de8c8cde0b87b4f7baf11fe5f4f.zip
Snap for 4562879 from a57d161c2e3eafeb0062c065f8185d0464f7f988 to pi-release
Change-Id: Ibd6d3ed26d9616b171ad3bbec5e0693b9b6bb603
-rw-r--r--src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java2
-rw-r--r--src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java6
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;