Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8374e25a authored by Miao Wang's avatar Miao Wang Committed by Android Git Automerger
Browse files

am 77877609: Merge "[RenderScript] fix Allocation.copyToFieldPacker" 

* commit '77877609':
  [RenderScript] fix Allocation.copyToFieldPacker
parents 71d057bd 77877609

rs/java/android/renderscript/Allocation.java

+1 −1
Original line number Diff line number Diff line
@@ -1449,7 +1449,7 @@ public class Allocation extends BaseObj { 
        }



        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

+1 −1
Original line number Diff line number Diff line
@@ -1452,7 +1452,7 @@ nAllocationElementRead(JNIEnv *_env, jobject _this, jlong con, jlong alloc, 
    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.