drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "[RenderScript] fix Allocation.copyToFieldPacker"

Browse Source
This commit is contained in:
Miao Wang
2015-05-19 16:45:07 +00:00
committed by Gerrit Code Review
parent 838a7e50eb bfa5e659e7
commit 7787760961
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rs/java/android/renderscript/Allocation.java
View File

@ -1448,7 +1448,7 @@ public class Allocation extends BaseObj {
} }
final byte[] data = fp.getData(); final byte[] data = fp.getData();
int data_length = fp.getPos(); int data_length = data.length;
int eSize = mType.mElement.mElements[component_number].getBytesSize(); int eSize = mType.mElement.mElements[component_number].getBytesSize();
eSize *= mType.mElement.mArraySizes[component_number]; eSize *= mType.mElement.mArraySizes[component_number];

2
rs/jni/android_renderscript_RenderScript.cpp
View File

@ -1462,7 +1462,7 @@ nAllocationElementRead(JNIEnv *_env, jobject _this, jlong con, jlong alloc,
rsAllocationElementRead((RsContext)con, (RsAllocation)alloc, rsAllocationElementRead((RsContext)con, (RsAllocation)alloc,
xoff, yoff, zoff, xoff, yoff, zoff,
lod, ptr, sizeBytes, compIdx); lod, ptr, sizeBytes, compIdx);
_env->ReleaseByteArrayElements(data, ptr, JNI_ABORT); _env->ReleaseByteArrayElements(data, ptr, 0);
} }
// Copies from the Allocation pointed to by _alloc into the Java object data. // Copies from the Allocation pointed to by _alloc into the Java object data.