Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efc91808 authored by Miao Wang's avatar Miao Wang Committed by android-build-merger
Browse files

Merge "[RenderScript] Fix IntrinsicConvolve documentation." into nyc-dev 

am: 2d92afbe

* commit '2d92afbe':
  [RenderScript] Fix IntrinsicConvolve documentation.

Change-Id: Ia3c8f26550801b17e816f7b86b5561161c10f2d5
parents c75772fc 2d92afbe

rs/java/android/renderscript/ScriptIntrinsicConvolve3x3.java

+4 −5
Original line number Diff line number Diff line
@@ -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 ]

rs/java/android/renderscript/ScriptIntrinsicConvolve5x5.java

+4 −4
Original line number Diff line number Diff line
@@ -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  ]