summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-08-12 11:48:14 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-08-12 11:48:14 -0700
commit4547962a95359f1d390b9cbb7459789391e86089 (patch)
treed5109c2c645dd39b5d5d0ad269a3efd56e27c22e
parent773c6341244ed0be380b8242fb6d17d53c491f56 (diff)
parenta8f2acee39aae94f9d7148f775ca8e35344da4b4 (diff)
downloadframeworks_base-4547962a95359f1d390b9cbb7459789391e86089.zip
frameworks_base-4547962a95359f1d390b9cbb7459789391e86089.tar.gz
frameworks_base-4547962a95359f1d390b9cbb7459789391e86089.tar.bz2
Merge change 20965
* changes: readData should read the data, not write the data.
-rw-r--r--graphics/jni/android_renderscript_RenderScript.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/graphics/jni/android_renderscript_RenderScript.cpp b/graphics/jni/android_renderscript_RenderScript.cpp
index 285fdc0..24bbea5 100644
--- a/graphics/jni/android_renderscript_RenderScript.cpp
+++ b/graphics/jni/android_renderscript_RenderScript.cpp
@@ -396,7 +396,7 @@ nAllocationRead_i(JNIEnv *_env, jobject _this, jint alloc, jintArray data)
jint len = _env->GetArrayLength(data);
LOG_API("nAllocationRead_i, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len);
jint *ptr = _env->GetIntArrayElements(data, NULL);
- rsAllocationData((RsAllocation)alloc, ptr);
+ rsAllocationRead((RsAllocation)alloc, ptr);
_env->ReleaseIntArrayElements(data, ptr, JNI_COMMIT);
}
@@ -405,9 +405,9 @@ nAllocationRead_f(JNIEnv *_env, jobject _this, jint alloc, jfloatArray data)
{
RsContext con = (RsContext)(_env->GetIntField(_this, gContextId));
jint len = _env->GetArrayLength(data);
- LOG_API("nAllocationRead_i, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len);
+ LOG_API("nAllocationRead_f, con(%p), alloc(%p), len(%i)", con, (RsAllocation)alloc, len);
jfloat *ptr = _env->GetFloatArrayElements(data, NULL);
- rsAllocationData((RsAllocation)alloc, ptr);
+ rsAllocationRead((RsAllocation)alloc, ptr);
_env->ReleaseFloatArrayElements(data, ptr, JNI_COMMIT);
}