commit 7787760961703239763afad9639517ce02259090
author Miao Wang <miaowang@google.com> Tue May 19 16:45:07 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue May 19 16:45:13 2015 +0000
tree feaa7760a40137dbaac30eb0dd3981987880edec
parent 838a7e50eba73d4e5289ea3975636a0c841bea70
parent bfa5e659e7b4cb49178d0e99712478b29f8301a7

Merge "[RenderScript] fix Allocation.copyToFieldPacker"

rs/java/android/renderscript/Allocation.java

diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java
index 4fa2c81..2ce11a2 100644
--- a/rs/java/android/renderscript/Allocation.java
+++ b/rs/java/android/renderscript/Allocation.java
@@ -1448,7 +1448,7 @@
         }
 
         final byte[] data = fp.getData();
-        int data_length = fp.getPos();
+        int data_length = data.length;
         int eSize = mType.mElement.mElements[component_number].getBytesSize();
         eSize *= mType.mElement.mArraySizes[component_number];
 

rs/jni/android_renderscript_RenderScript.cpp

diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index 3665851..ec835b2 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -1462,7 +1462,7 @@
     rsAllocationElementRead((RsContext)con, (RsAllocation)alloc,
                             xoff, yoff, zoff,
                             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.