Merge "POSITVE -> POSITIVE typo fix" (dc122622) · Commits · e / os / android_frameworks_base

api/current.txt

+6 −3

Original line number	Diff line number	Diff line
		@@ -17387,9 +17387,12 @@ package android.renderscript {
		enum_constant public static final android.renderscript.Type.CubemapFace NEGATIVE_X;
		enum_constant public static final android.renderscript.Type.CubemapFace NEGATIVE_Y;
		enum_constant public static final android.renderscript.Type.CubemapFace NEGATIVE_Z;
		enum_constant public static final android.renderscript.Type.CubemapFace POSITVE_X;
		enum_constant public static final android.renderscript.Type.CubemapFace POSITVE_Y;
		enum_constant public static final android.renderscript.Type.CubemapFace POSITVE_Z;
		enum_constant public static final android.renderscript.Type.CubemapFace POSITIVE_X;
		enum_constant public static final android.renderscript.Type.CubemapFace POSITIVE_Y;
		enum_constant public static final android.renderscript.Type.CubemapFace POSITIVE_Z;
		enum_constant public static final deprecated android.renderscript.Type.CubemapFace POSITVE_X;
		enum_constant public static final deprecated android.renderscript.Type.CubemapFace POSITVE_Y;
		enum_constant public static final deprecated android.renderscript.Type.CubemapFace POSITVE_Z;
		}

		}

graphics/java/android/renderscript/Allocation.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -606,9 +606,9 @@ public class Allocation extends BaseObj {
		*/
		public void copy1DRangeFrom(int off, int count, Allocation data, int dataOff) {
		mRS.nAllocationData2D(getID(), off, 0,
		0, Type.CubemapFace.POSITVE_X.mID,
		0, Type.CubemapFace.POSITIVE_X.mID,
		count, 1, data.getID(), dataOff, 0,
		0, Type.CubemapFace.POSITVE_X.mID);
		0, Type.CubemapFace.POSITIVE_X.mID);
		}

		private void validate2DRange(int xoff, int yoff, int w, int h) {
		@@ -675,9 +675,9 @@ public class Allocation extends BaseObj {
		mRS.validate();
		validate2DRange(xoff, yoff, w, h);
		mRS.nAllocationData2D(getID(), xoff, yoff,
		0, Type.CubemapFace.POSITVE_X.mID,
		0, Type.CubemapFace.POSITIVE_X.mID,
		w, h, data.getID(), dataXoff, dataYoff,
		0, Type.CubemapFace.POSITVE_X.mID);
		0, Type.CubemapFace.POSITIVE_X.mID);
		}

		/**
		@@ -1048,15 +1048,15 @@ public class Allocation extends BaseObj {
		Allocation cubemap = Allocation.createTyped(rs, t, mips, usage);

		AllocationAdapter adapter = AllocationAdapter.create2D(rs, cubemap);
		adapter.setFace(Type.CubemapFace.POSITVE_X);
		adapter.setFace(Type.CubemapFace.POSITIVE_X);
		adapter.copyFrom(xpos);
		adapter.setFace(Type.CubemapFace.NEGATIVE_X);
		adapter.copyFrom(xneg);
		adapter.setFace(Type.CubemapFace.POSITVE_Y);
		adapter.setFace(Type.CubemapFace.POSITIVE_Y);
		adapter.copyFrom(ypos);
		adapter.setFace(Type.CubemapFace.NEGATIVE_Y);
		adapter.copyFrom(yneg);
		adapter.setFace(Type.CubemapFace.POSITVE_Z);
		adapter.setFace(Type.CubemapFace.POSITIVE_Z);
		adapter.copyFrom(zpos);
		adapter.setFace(Type.CubemapFace.NEGATIVE_Z);
		adapter.copyFrom(zneg);

graphics/java/android/renderscript/AllocationAdapter.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ public class AllocationAdapter extends Allocation {
		private Allocation mAlloc;

		private int mSelectedLOD = 0;
		private Type.CubemapFace mSelectedFace = Type.CubemapFace.POSITVE_X;
		private Type.CubemapFace mSelectedFace = Type.CubemapFace.POSITIVE_X;

		AllocationAdapter(int id, RenderScript rs, Allocation alloc) {
		super(id, rs, null, alloc.mUsage);

graphics/java/android/renderscript/Type.java

+10 −4

Original line number	Diff line number	Diff line
		@@ -46,12 +46,18 @@ public class Type extends BaseObj {
		Element mElement;

		public enum CubemapFace {
		POSITVE_X (0),
		POSITIVE_X (0),
		NEGATIVE_X (1),
		POSITVE_Y (2),
		POSITIVE_Y (2),
		NEGATIVE_Y (3),
		POSITVE_Z (4),
		NEGATIVE_Z (5);
		POSITIVE_Z (4),
		NEGATIVE_Z (5),
		@Deprecated
		POSITVE_X (0),
		@Deprecated
		POSITVE_Y (2),
		@Deprecated
		POSITVE_Z (4);

		int mID;
		CubemapFace(int id) {