Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Rename convolve3x3.rs to prevent collisions."

Browse Source
This commit is contained in:
Stephen Hines
2013-02-07 03:19:34 +00:00
committed by Android (Google) Code Review
parent 3c6721899e 1b2ad77a9f
commit 1d9ea8a83a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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);

0
tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/convolve3x3.rs → tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/ip2_convolve3x3.rs
View File