diff options
| author | Christopher Tate <ctate@android.com> | 2013-01-22 18:42:40 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-22 18:42:40 -0800 |
| commit | e93ca308c8792b231ec921ba8a00e6c78e87f9ad (patch) | |
| tree | d7b2ec89f9d5d1ffa57b760319aba7ba8a6ede2d | |
| parent | ef5d1d635585b155ffc7882c916beee2a91e2ef2 (diff) | |
| parent | 0e95685ff49c4d189464170cc03d2d74f23da475 (diff) | |
| download | frameworks_base-e93ca308c8792b231ec921ba8a00e6c78e87f9ad.zip frameworks_base-e93ca308c8792b231ec921ba8a00e6c78e87f9ad.tar.gz frameworks_base-e93ca308c8792b231ec921ba8a00e6c78e87f9ad.tar.bz2 | |
am 0e95685f: am b5a72043: Merge "Fix array index oob in Matrix3f.loadRotate()."
* commit '0e95685ff49c4d189464170cc03d2d74f23da475':
Fix array index oob in Matrix3f.loadRotate().
| -rw-r--r-- | graphics/java/android/renderscript/Matrix3f.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/Matrix3f.java b/graphics/java/android/renderscript/Matrix3f.java index 66f2c81..0bad7e0 100644 --- a/graphics/java/android/renderscript/Matrix3f.java +++ b/graphics/java/android/renderscript/Matrix3f.java @@ -138,7 +138,7 @@ public class Matrix3f { mMat[6] = zx*nc + ys; mMat[1] = xy*nc + zs; mMat[4] = y*y*nc + c; - mMat[9] = yz*nc - xs; + mMat[7] = yz*nc - xs; mMat[2] = zx*nc - ys; mMat[6] = yz*nc + xs; mMat[8] = z*z*nc + c; |