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

Commit 1d9ea8a8 authored by Stephen Hines's avatar Stephen Hines Committed by Android (Google) Code Review
Browse files

Merge "Rename convolve3x3.rs to prevent collisions."

parents 3c672189 1b2ad77a

tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ import android.support.v8.renderscript.*; 
import android.util.Log;



public class Convolve3x3 extends TestBase {

    private ScriptC_convolve3x3 mScript;

    private ScriptC_ip2_convolve3x3 mScript;

    private ScriptIntrinsicConvolve3x3 mIntrinsic;



    private int mWidth;
@@ -47,7 +47,7 @@ public class Convolve3x3 extends TestBase { 
            mIntrinsic.setCoefficients(f);

            mIntrinsic.setInput(mInPixelsAllocation);

        } else {

            mScript = new ScriptC_convolve3x3(mRS, res, R.raw.convolve3x3);

            mScript = new ScriptC_ip2_convolve3x3(mRS, res, R.raw.ip2_convolve3x3);

            mScript.set_gCoeffs(f);

            mScript.set_gIn(mInPixelsAllocation);

            mScript.set_gWidth(mWidth);