summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Sams <rjsams@android.com>2010-08-05 18:11:49 -0700
committerJason Sams <rjsams@android.com>2010-08-05 18:11:49 -0700
commit41d9825b9aa1eb986990cd43513f7bdc6be0b88e (patch)
treedf8362d3bf277903a52142cf8a7d005053b8665e
parent1911c60a4eeff9ee28734687ae7699bd2290931c (diff)
downloadframeworks_base-41d9825b9aa1eb986990cd43513f7bdc6be0b88e.zip
frameworks_base-41d9825b9aa1eb986990cd43513f7bdc6be0b88e.tar.gz
frameworks_base-41d9825b9aa1eb986990cd43513f7bdc6be0b88e.tar.bz2
Fix length normilization bug in rsMatrixLoadRotate.
Change-Id: Ibdc1a64f2db6110acd971f8cacd6b1f9c09b02de
-rw-r--r--libs/rs/rsMatrix.cpp2
-rw-r--r--libs/rs/scriptc/rs_core.rsh2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/rs/rsMatrix.cpp b/libs/rs/rsMatrix.cpp
index 2f21405..94eef13 100644
--- a/libs/rs/rsMatrix.cpp
+++ b/libs/rs/rsMatrix.cpp
@@ -73,7 +73,7 @@ void Matrix::loadRotate(float rot, float x, float y, float z)
s = sinf(rot);
const float len = sqrtf(x*x + y*y + z*z);
- if (!(len != 1)) {
+ if (len != 1) {
const float recipLen = 1.f / len;
x *= recipLen;
y *= recipLen;
diff --git a/libs/rs/scriptc/rs_core.rsh b/libs/rs/scriptc/rs_core.rsh
index 01b039f..93e009a 100644
--- a/libs/rs/scriptc/rs_core.rsh
+++ b/libs/rs/scriptc/rs_core.rsh
@@ -260,7 +260,7 @@ rsMatrixLoadRotate(rs_matrix4x4 *m, float rot, float x, float y, float z) {
s = sin(rot);
const float len = x*x + y*y + z*z;
- if (!(len != 1)) {
+ if (len != 1) {
const float recipLen = 1.f / sqrt(len);
x *= recipLen;
y *= recipLen;