diff options
| author | Miao Wang <miaowang@google.com> | 2015-04-30 21:25:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-04-30 21:25:25 +0000 |
| commit | 8724d359bfe1f95fd4c558b55069e1624b461f28 (patch) | |
| tree | 00148ae63a7ea182e7bdbd1af21aedf5a6be7b1b /rs | |
| parent | 01060a33a446a496cafcb06487c60df25775a1b9 (diff) | |
| parent | 82585b3906955e57e199d962b8fe11b2bab87fba (diff) | |
| download | frameworks_base-8724d359bfe1f95fd4c558b55069e1624b461f28.zip frameworks_base-8724d359bfe1f95fd4c558b55069e1624b461f28.tar.gz frameworks_base-8724d359bfe1f95fd4c558b55069e1624b461f28.tar.bz2 | |
Merge "[RenderScript] typo fix in rs BLAS jni, to correctly handle complex params." into mnc-dev
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp index ae48a5f..5ef807d 100644 --- a/rs/jni/android_renderscript_RenderScript.cpp +++ b/rs/jni/android_renderscript_RenderScript.cpp @@ -526,7 +526,7 @@ nScriptIntrinsicBLAS_Complex(JNIEnv *_env, jobject _this, jlong con, jlong id, j call.alpha.c.r = alphaX; call.alpha.c.i = alphaY; call.beta.c.r = betaX; - call.beta.c.r = betaY; + call.beta.c.i = betaY; call.incX = incX; call.incY = incY; call.KL = KL; @@ -561,7 +561,7 @@ nScriptIntrinsicBLAS_Z(JNIEnv *_env, jobject _this, jlong con, jlong id, jint fu call.alpha.z.r = alphaX; call.alpha.z.i = alphaY; call.beta.z.r = betaX; - call.beta.z.r = betaY; + call.beta.z.i = betaY; call.incX = incX; call.incY = incY; call.KL = KL; |