diff options
| author | Miao Wang <miaowang@google.com> | 2015-05-19 21:17:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-19 21:17:28 +0000 |
| commit | 8374e25a9ee53ba6faa8d5a20e92506ef74c15a1 (patch) | |
| tree | 4dade7a8211538db559fd91a44309d3794c12126 /rs/java/android/renderscript/Allocation.java | |
| parent | 71d057bdc428382703669e65c41a00282ee323c1 (diff) | |
| parent | 7787760961703239763afad9639517ce02259090 (diff) | |
am 77877609: Merge "[RenderScript] fix Allocation.copyToFieldPacker"
* commit '7787760961703239763afad9639517ce02259090':
[RenderScript] fix Allocation.copyToFieldPacker
Diffstat (limited to 'rs/java/android/renderscript/Allocation.java')
| -rw-r--r-- | rs/java/android/renderscript/Allocation.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rs/java/android/renderscript/Allocation.java b/rs/java/android/renderscript/Allocation.java index 70a5821bd6a3..eef120cfc572 100644 --- a/rs/java/android/renderscript/Allocation.java +++ b/rs/java/android/renderscript/Allocation.java @@ -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]; |