diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2012-02-02 14:54:32 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-02-02 14:54:32 -0800 |
| commit | 7042613c653fd0de253f2f659901318902fa4584 (patch) | |
| tree | bb14776ff979dfaf5d36a86dc85da3430cd8bdae /graphics/java/android/renderscript/Allocation.java | |
| parent | 229e25d404fde2880e3858b1df2d0d1b6f3ad9e0 (diff) | |
| parent | bf3c3f2ab1067b647038170cb201cdd1a9a1c6d2 (diff) | |
Merge "Fix an incorrect assert that doesn't account for element array size."
Diffstat (limited to 'graphics/java/android/renderscript/Allocation.java')
| -rw-r--r-- | graphics/java/android/renderscript/Allocation.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index f285f5b5ac0c..11c242759d91 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -487,6 +487,7 @@ public class Allocation extends BaseObj { final byte[] data = fp.getData(); int eSize = mType.mElement.mElements[component_number].getSizeBytes(); + eSize *= mType.mElement.mArraySizes[component_number]; if (data.length != eSize) { throw new RSIllegalArgumentException("Field packer sizelength " + data.length + |