diff options
author | Ian Rogers <irogers@google.com> | 2016-03-17 22:39:05 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2016-03-17 22:39:05 -0700 |
commit | a900c0a7b4f3fd4797290428a97c48066a2689eb (patch) | |
tree | c23ab181f41f6dca3c9ddbbfeed6ea6f65355d04 /src/com | |
parent | dd25dbe55a28122415a6c8d8fc556d2a31f7f248 (diff) | |
download | android_packages_apps_Gallery2-a900c0a7b4f3fd4797290428a97c48066a2689eb.tar.gz android_packages_apps_Gallery2-a900c0a7b4f3fd4797290428a97c48066a2689eb.tar.bz2 android_packages_apps_Gallery2-a900c0a7b4f3fd4797290428a97c48066a2689eb.zip |
Float.NaN != ... always evaluates to true, use Float.isNaN.
Caught by error prone.
http://errorprone.info/bugpattern/EqualsNaN
Bug: 27723540
Change-Id: Ia83b2937ab9e92ebd1c52b7199903a599fbe5ce5
Diffstat (limited to 'src/com')
7 files changed, 7 insertions, 9 deletions
diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java index 9b955efc6..b2118e093 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorBrightnessView.java @@ -171,7 +171,7 @@ public class ColorBrightnessView extends View implements ColorListener { canvas.drawRect(mBorder, mBorder, mWidth - mBorder, mHeight - mBorder, mBarPaint1); canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1); canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2); - if (mDotX != Float.NaN) { + if (!Float.isNaN(mDotX)) { canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint); } } diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java index 498f5a4b6..61b3621a3 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorHueView.java @@ -179,7 +179,7 @@ public class ColorHueView extends View implements ColorListener { canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1); canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2); - if (mDotX != Float.NaN) { + if (!Float.isNaN(mDotX)) { canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint); } } diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java index ec15b5b09..970a2ffb5 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorOpacityView.java @@ -171,7 +171,7 @@ public class ColorOpacityView extends View implements ColorListener { canvas.drawRect(mBorder, 0, mWidth - mBorder, mHeight, mBarPaint1); canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1); canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2); - if (mDotX != Float.NaN) { + if (!Float.isNaN(mDotX)) { canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint); } } diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java index 07d7c7126..92f4ad8fe 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorRectView.java @@ -170,8 +170,7 @@ public class ColorRectView extends View implements ColorListener { canvas.drawRect(rect, mWheelPaint3); canvas.drawRect(rect, mWheelPaint2); - if (mDotX != Float.NaN) { - + if (!Float.isNaN(mDotX)) { canvas.drawCircle(mDotX, mDotY, mDotRadus, mDotPaint); } } diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java index fb8b4fcb4..6ebb48baa 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorSVRectView.java @@ -126,8 +126,7 @@ public class ColorSVRectView extends View implements ColorListener { mRect.right -= mBorder; canvas.drawBitmap(mBitmap, null, mRect, mPaint1); - if (mDotX != Float.NaN) { - + if (!Float.isNaN(mDotX)) { canvas.drawCircle(mDotX, mDotY, mDotRadus, mDotPaint); } } diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java index af4dfdaa1..a29eee92f 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorSaturationView.java @@ -170,7 +170,7 @@ public class ColorSaturationView extends View implements ColorListener { canvas.drawRect(mBorder, mBorder, mWidth - mBorder, mHeight - mBorder, mBarPaint1); canvas.drawLine(mDotX, mDotY, mWidth - mBorder, mDotY, mLinePaint1); canvas.drawLine(mBorder, mDotY, mDotX, mDotY, mLinePaint2); - if (mDotX != Float.NaN) { + if (!Float.isNaN(mDotX)) { canvas.drawCircle(mDotX, mDotY, mDotRadius, mDotPaint); } } diff --git a/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java b/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java index bbfd829b3..0ace5d0bb 100644 --- a/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java +++ b/src/com/android/gallery3d/filtershow/colorpicker/ColorValueView.java @@ -148,7 +148,7 @@ public class ColorValueView extends View implements ColorListener { canvas.drawRect(mBorder, mBorder, mWidth - mBorder, mHeight - mBorder, mBarPaint1); canvas.drawLine(mDotX, mDotY, mDotX, mHeight - mBorder, mLinePaint2); canvas.drawLine(mDotX, mBorder, mDotX, mDotY, mLinePaint1); - if (mDotX != Float.NaN) { + if (!Float.isNaN(mDotX)) { canvas.drawCircle(mDotX, mDotY, dotRadus, mDotPaint); } } |