Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 6aed9ec1: Merge "[RenderScript] update exception reporting for copyTo() after autoPadding added."

Browse Source 
* commit '6aed9ec1b85ff1a8a39c4ec091a017f79413ead0':
  [RenderScript] update exception reporting for copyTo() after autoPadding added.
This commit is contained in:
Miao Wang
2015-04-03 17:55:42 +00:00
committed by Android Git Automerger
parent fce4220b88 6aed9ec1b8
commit 511eb66092
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
rs/java/android/renderscript/Allocation.java
View File

@@ -1340,15 +1340,22 @@ public class Allocation extends BaseObj {
private void copyTo(Object array, Element.DataType dt, int arrayLen) { private void copyTo(Object array, Element.DataType dt, int arrayLen) {
Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo"); Trace.traceBegin(RenderScript.TRACE_TAG, "copyTo");
if (dt.mSize * arrayLen < mSize) {
throw new RSIllegalArgumentException(
"Size of output array cannot be smaller than size of allocation.");
}
mRS.validate(); mRS.validate();
boolean usePadding = false; boolean usePadding = false;
if (mAutoPadding && (mType.getElement().getVectorSize() == 3)) { if (mAutoPadding && (mType.getElement().getVectorSize() == 3)) {
usePadding = true; usePadding = true;
} }
if (usePadding) {
if (dt.mSize * arrayLen < mSize / 4 * 3) {
throw new RSIllegalArgumentException(
"Size of output array cannot be smaller than size of allocation.");
}
} else {
if (dt.mSize * arrayLen < mSize) {
throw new RSIllegalArgumentException(
"Size of output array cannot be smaller than size of allocation.");
}
}
mRS.nAllocationRead(getID(mRS), array, dt, mType.mElement.mType.mSize, usePadding); mRS.nAllocationRead(getID(mRS), array, dt, mType.mElement.mType.mSize, usePadding);
Trace.traceEnd(RenderScript.TRACE_TAG); Trace.traceEnd(RenderScript.TRACE_TAG);
} }