summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craik <ccraik@google.com>2014-04-22 17:29:22 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-22 17:29:23 +0000
commit98ae02c5996513d252e22d974fac5f56e8078de7 (patch)
treea9b142322c18d0a42ae93b4137126e9fc9413535
parent9a722ebc320c7d8842322fef6f80b0481c8aab5e (diff)
parent222f33178b1547b70350ead660070eb01e56eac2 (diff)
downloadframeworks_base-98ae02c5996513d252e22d974fac5f56e8078de7.zip
frameworks_base-98ae02c5996513d252e22d974fac5f56e8078de7.tar.gz
frameworks_base-98ae02c5996513d252e22d974fac5f56e8078de7.tar.bz2
Merge "Fix is_zero check"
-rw-r--r--libs/hwui/RenderProperties.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/hwui/RenderProperties.cpp b/libs/hwui/RenderProperties.cpp
index 08829ef..58ec32d 100644
--- a/libs/hwui/RenderProperties.cpp
+++ b/libs/hwui/RenderProperties.cpp
@@ -34,7 +34,7 @@
#define NONZERO_EPSILON .001f
static inline bool is_zero(float value) {
- return (value >= -NONZERO_EPSILON) || (value <= NONZERO_EPSILON);
+ return (value >= -NONZERO_EPSILON) && (value <= NONZERO_EPSILON);
}
namespace android {