diff options
| author | Stephen Hines <srhines@google.com> | 2011-06-17 13:53:20 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-06-17 13:53:20 -0700 |
| commit | dc122622307579fa0c46a597aff5a5017617d64c (patch) | |
| tree | c24198b2e8cef966d1169296ef79dd2ef0cd37c5 /graphics | |
| parent | 2b1382de8c50f483b0595b54fd87a482e6eba834 (diff) | |
| parent | 20fbd01335f3a41ab78e0bb9f70124665afb1e3b (diff) | |
| download | frameworks_base-dc122622307579fa0c46a597aff5a5017617d64c.zip frameworks_base-dc122622307579fa0c46a597aff5a5017617d64c.tar.gz frameworks_base-dc122622307579fa0c46a597aff5a5017617d64c.tar.bz2 | |
Merge "POSITVE -> POSITIVE typo fix"
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/renderscript/Allocation.java | 14 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/AllocationAdapter.java | 2 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/Type.java | 14 |
3 files changed, 18 insertions, 12 deletions
diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index a63abb9..eeab9b4 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -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); diff --git a/graphics/java/android/renderscript/AllocationAdapter.java b/graphics/java/android/renderscript/AllocationAdapter.java index 07a1f5d..61f2e1f 100644 --- a/graphics/java/android/renderscript/AllocationAdapter.java +++ b/graphics/java/android/renderscript/AllocationAdapter.java @@ -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); diff --git a/graphics/java/android/renderscript/Type.java b/graphics/java/android/renderscript/Type.java index b39d2e4..f88af8b 100644 --- a/graphics/java/android/renderscript/Type.java +++ b/graphics/java/android/renderscript/Type.java @@ -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) { |