Merge "Add error checks to bitmap uploads. Fix java side calculation for pixel... (d345505a) · Commits · e / os / android_frameworks_base

graphics/java/android/renderscript/Allocation.java

+43 −0

Original line number	Diff line number	Diff line
		@@ -122,6 +122,49 @@ public class Allocation extends BaseObj {
		mType.getY() != b.getHeight()) {
		throw new RSIllegalArgumentException("Cannot update allocation from bitmap, sizes mismatch");
		}
		Bitmap.Config bc = b.getConfig();
		switch (bc) {
		case ALPHA_8:
		if (mType.getElement().mKind != Element.DataKind.PIXEL_A) {
		throw new RSIllegalArgumentException("Allocation kind is " +
		mType.getElement().mKind + ", type " +
		mType.getElement().mType +
		" of " + mType.getElement().getSizeBytes() +
		" bytes, passed bitmap was " + bc);
		}
		break;
		case ARGB_8888:
		if ((mType.getElement().mKind != Element.DataKind.PIXEL_RGBA) \|\|
		(mType.getElement().getSizeBytes() != 4)) {
		throw new RSIllegalArgumentException("Allocation kind is " +
		mType.getElement().mKind + ", type " +
		mType.getElement().mType +
		" of " + mType.getElement().getSizeBytes() +
		" bytes, passed bitmap was " + bc);
		}
		break;
		case RGB_565:
		if ((mType.getElement().mKind != Element.DataKind.PIXEL_RGB) \|\|
		(mType.getElement().getSizeBytes() != 2)) {
		throw new RSIllegalArgumentException("Allocation kind is " +
		mType.getElement().mKind + ", type " +
		mType.getElement().mType +
		" of " + mType.getElement().getSizeBytes() +
		" bytes, passed bitmap was " + bc);
		}
		break;
		case ARGB_4444:
		if ((mType.getElement().mKind != Element.DataKind.PIXEL_RGBA) \|\|
		(mType.getElement().getSizeBytes() != 2)) {
		throw new RSIllegalArgumentException("Allocation kind is " +
		mType.getElement().mKind + ", type " +
		mType.getElement().mType +
		" of " + mType.getElement().getSizeBytes() +
		" bytes, passed bitmap was " + bc);
		}
		break;

		}
		}

		public void copyFrom(int[] d) {

graphics/java/android/renderscript/Element.java

+7 −1

Original line number	Diff line number	Diff line
		@@ -425,7 +425,13 @@ public class Element extends BaseObj {

		Element(int id, RenderScript rs, DataType dt, DataKind dk, boolean norm, int size) {
		super(id, rs);
		if ((dt != DataType.UNSIGNED_5_6_5) &&
		(dt != DataType.UNSIGNED_4_4_4_4) &&
		(dt != DataType.UNSIGNED_5_5_5_1)) {
		mSize = dt.mSize * size;
		} else {
		mSize = dt.mSize;
		}
		mType = dt;
		mKind = dk;
		mNormalized = norm;