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

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

Browse Source 
* commit '1327fa9eb155eb57fe24a8aa90a18f57d706e86b':
  [RenderScript] update exception reporting for copyTo() after autoPadding added.
This commit is contained in:
Miao Wang
2015-04-03 18:18:01 +00:00
committed by Android Git Automerger
parent da656fd8c3 1327fa9eb1
commit edea751f64
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) {
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();
boolean usePadding = false;
if (mAutoPadding && (mType.getElement().getVectorSize() == 3)) {
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);
Trace.traceEnd(RenderScript.TRACE_TAG);
}