diff options
| author | Alex Sakhartchouk <alexst@google.com> | 2012-02-02 14:56:34 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-02 14:56:34 -0800 |
| commit | 98bea4a3ec6dfd0f5c6ec612b57b122f16f49b7f (patch) | |
| tree | 877115f9e72c9e1c2ec0b45ff30f455cef0494c8 /graphics/java/android/renderscript/Allocation.java | |
| parent | 8d1c18a181df7d141e8e341e8b120caf3717a506 (diff) | |
| parent | 7042613c653fd0de253f2f659901318902fa4584 (diff) | |
am 7042613c: Merge "Fix an incorrect assert that doesn\'t account for element array size."
* commit '7042613c653fd0de253f2f659901318902fa4584':
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 0ea48210402a..88ee3626027c 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -532,6 +532,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 + |