提交: 9ac972e9bcaa0409a83d7de59ac364ddde7c0d5f - packages-apps-Gallery2 (git)

packages/apps/Gallery2

Commit MetaInfo

• 修订版: 9ac972e9bcaa0409a83d7de59ac364ddde7c0d5f (tree)
• 时间: 2018-01-24 01:58:45
• 作者: Andreas Gampe <agampe@goog...>
• Commiter: android-build-merger

Log Message

Merge "Gallery2: Fix NaN comparisons"
am: 6f8c54d224

Change-Id: Iba67789fa694e0978370dbd0ad60c14bb8222be6

更改概述

• modified: src/com/android/gallery3d/filtershow/filters/FilterVignetteRepresentation.java
• modified: src/com/android/gallery3d/filtershow/imageshow/EclipseControl.java

差异

--- 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

--- 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;