diff options
| author | Miao Wang <miaowang@google.com> | 2016-03-30 01:02:28 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-03-30 01:02:28 +0000 |
| commit | 1a11efba2bf3bc12fab53df1185dad4756d6b313 (patch) | |
| tree | 364a979e404bc6dbe8cf01db99ea36db3a538e79 /rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java | |
| parent | 4af5c34a78ab65c22fa931bd9167f18b9211fd99 (diff) | |
| parent | ebfcdb935e86efcd7cda7b94785519647e135292 (diff) | |
Merge changes Iaa88ac02,Ic6f8d1da,Idd07db5d
* changes:
[RenderScript] Update documentation for Allocation.setAutoPadding().
[RenderScript] Fix IntrinsicConvolve documentation.
[RenderScript] Update the documentation of Script.LaunchOptions
Diffstat (limited to 'rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java')
| -rw-r--r-- | rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java | 8 |
1 files changed, 4 insertions, 4 deletions
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 ] |