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

Commit 8d0c431a authored by Jason Sams's avatar Jason Sams Committed by Android Git Automerger
Browse files

am 009d5413: Merge "Fix bugs in scriptGroup." into jb-mr1-dev 

* commit '009d5413':
  Fix bugs in scriptGroup.
parents 5c2e971a 009d5413

graphics/java/android/renderscript/ScriptIntrinsicBlur.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic { 
     */

     */

    public void setInput(Allocation ain) {

    public void setInput(Allocation ain) {

        mInput = ain;

        mInput = ain;

        bindAllocation(ain, 1);

        setVar(1, ain);

    }

    }





    /**

    /**

graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -68,7 +68,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic { 
     */

     */

    public void setInput(Allocation ain) {

    public void setInput(Allocation ain) {

        mInput = ain;

        mInput = ain;

        bindAllocation(ain, 1);

        setVar(1, ain);

    }

    }





    /**

    /**

graphics/java/android/renderscript/ScriptIntrinsicConvolve5x5.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -61,7 +61,7 @@ public final class ScriptIntrinsicConvolve5x5 extends ScriptIntrinsic { 
     */

     */

    public void setInput(Allocation ain) {

    public void setInput(Allocation ain) {

        mInput = ain;

        mInput = ain;

        bindAllocation(ain, 1);

        setVar(1, ain);

    }

    }





    /**

    /**

graphics/java/android/renderscript/ScriptIntrinsicYuvToRGB.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -56,7 +56,7 @@ public final class ScriptIntrinsicYuvToRGB extends ScriptIntrinsic { 
     */

     */

    public void setInput(Allocation ain) {

    public void setInput(Allocation ain) {

        mInput = ain;

        mInput = ain;

        bindAllocation(ain, 0);

        setVar(0, ain);

    }

    }





    /**

    /**