diff options
| -rw-r--r-- | api/current.txt | 6 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java | 4 | ||||
| -rw-r--r-- | graphics/java/android/renderscript/ScriptIntrinsicHistogram.java | 4 |
3 files changed, 9 insertions, 5 deletions
diff --git a/api/current.txt b/api/current.txt index 5f7fe50..b0ecb76 100644 --- a/api/current.txt +++ b/api/current.txt @@ -22388,7 +22388,7 @@ package android.renderscript { } public final class ScriptIntrinsicColorMatrix extends android.renderscript.ScriptIntrinsic { - method public static android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element); + method public static deprecated android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript, android.renderscript.Element); method public static android.renderscript.ScriptIntrinsicColorMatrix create(android.renderscript.RenderScript); method public void forEach(android.renderscript.Allocation, android.renderscript.Allocation); method public android.renderscript.Script.KernelID getKernelID(); @@ -22422,9 +22422,9 @@ package android.renderscript { public final class ScriptIntrinsicHistogram extends android.renderscript.ScriptIntrinsic { method public static android.renderscript.ScriptIntrinsicHistogram create(android.renderscript.RenderScript, android.renderscript.Element); method public void forEach(android.renderscript.Allocation); - method public void forEach_dot(android.renderscript.Allocation); + method public void forEach_Dot(android.renderscript.Allocation); method public android.renderscript.Script.FieldID getFieldID_Input(); - method public android.renderscript.Script.KernelID getKernelID_seperate(); + method public android.renderscript.Script.KernelID getKernelID_Separate(); method public void setDotCoefficients(float, float, float, float); method public void setOutput(android.renderscript.Allocation); } diff --git a/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java b/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java index 6881627..32c3d15 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java @@ -56,8 +56,12 @@ public final class ScriptIntrinsicColorMatrix extends ScriptIntrinsic { * this parameter is ignored. The Element type check is * performed in the kernel launch. * + * @deprecated Use the single argument version as Element is now + * ignored. + * * @return ScriptIntrinsicColorMatrix */ + @Deprecated public static ScriptIntrinsicColorMatrix create(RenderScript rs, Element e) { return create(rs); } diff --git a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java b/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java index f143326..adc2d95 100644 --- a/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java +++ b/graphics/java/android/renderscript/ScriptIntrinsicHistogram.java @@ -151,7 +151,7 @@ public final class ScriptIntrinsicHistogram extends ScriptIntrinsic { * * @param ain The input image */ - public void forEach_dot(Allocation ain) { + public void forEach_Dot(Allocation ain) { if (mOut.getType().getElement().getVectorSize() != 1) { throw new RSIllegalArgumentException("Output vector size must be one."); } @@ -170,7 +170,7 @@ public final class ScriptIntrinsicHistogram extends ScriptIntrinsic { * * @return Script.KernelID The KernelID object. */ - public Script.KernelID getKernelID_seperate() { + public Script.KernelID getKernelID_Separate() { return createKernelID(0, 3, null, null); } |