diff options
| author | 2016-03-29 23:55:42 +0000 | |
|---|---|---|
| committer | 2016-03-29 23:55:44 +0000 | |
| commit | 2d92afbef78098076eb0d9efd8c5cf4a6e8d0542 (patch) | |
| tree | 45bac0a07ad1db485a02e290aa3a36d931153f6b /rs/java/android | |
| parent | 44fa90868cb15fc0ab85b48d6a4ac22d568e9e88 (diff) | |
| parent | 3d23dce43330b9c8f3fba34ef9515dca7912768a (diff) | |
Merge "[RenderScript] Fix IntrinsicConvolve documentation." into nyc-dev
Diffstat (limited to 'rs/java/android')
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java | 9 | ||||
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java index 76da781004d8..339e0e9dc975 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java +++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java @@ -32,10 +32,9 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { * Supported elements types are {@link Element#U8}, {@link * Element#U8_2}, {@link Element#U8_3}, {@link Element#U8_4}, * {@link Element#F32}, {@link Element#F32_2}, {@link - * Element#F32_3}, and {@link Element#F32_4} - * - * The default coefficients are. + * Element#F32_3}, and {@link Element#F32_4}. * + * <p> The default coefficients are: * <code> * <p> [ 0, 0, 0 ] * <p> [ 0, 1, 0 ] @@ -67,7 +66,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { } /** - * Set the input of the blur. + * Set the input of the 3x3 convolve. * Must match the element type supplied during create. * * @param ain The input allocation. @@ -80,7 +79,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { /** * Set the coefficients for the convolve. * - * The convolve layout is + * <p> The convolve layout is: * <code> * <p> [ 0, 1, 2 ] * <p> [ 3, 4, 5 ] diff --git a/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java b/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java index 2d37600dc492..a288cee407f0 100644 --- a/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java +++ b/rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java @@ -32,9 +32,9 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic { * Supported elements types are {@link Element#U8}, {@link * Element#U8_2}, {@link Element#U8_3}, {@link Element#U8_4}, * {@link Element#F32}, {@link Element#F32_2}, {@link - * Element#F32_3}, and {@link Element#F32_4} + * Element#F32_3}, and {@link Element#F32_4}. * - * The default coefficients are. + * <p> The default coefficients are: * <code> * <p> [ 0, 0, 0, 0, 0 ] * <p> [ 0, 0, 0, 0, 0 ] @@ -66,7 +66,7 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic { } /** - * Set the input of the blur. + * Set the input of the 5x5 convolve. * Must match the element type supplied during create. * * @param ain The input allocation. @@ -79,7 +79,7 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic { /** * Set the coefficients for the convolve. * - * The convolve layout is + * <p> The convolve layout is: * <code> * <p> [ 0, 1, 2, 3, 4 ] * <p> [ 5, 6, 7, 8, 9 ] |