diff options
| author | Stephen Hines <srhines@google.com> | 2013-02-06 17:33:18 -0800 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2013-02-06 17:33:18 -0800 |
| commit | 1b2ad77a9fc777aa4c642a14785e086b4ee1f829 (patch) | |
| tree | e6fd882df79171f9367b393b97794c432dca407f /tests/RenderScriptTests | |
| parent | 506f65c3043e98ef598f1329eaf55add01cc8675 (diff) | |
| download | frameworks_base-1b2ad77a9fc777aa4c642a14785e086b4ee1f829.zip frameworks_base-1b2ad77a9fc777aa4c642a14785e086b4ee1f829.tar.gz frameworks_base-1b2ad77a9fc777aa4c642a14785e086b4ee1f829.tar.bz2 | |
Rename convolve3x3.rs to prevent collisions.
Change-Id: I9046348959d51fda6142e16f1226fed0c57a6d16
Diffstat (limited to 'tests/RenderScriptTests')
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java | 4 | ||||
| -rw-r--r-- | tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/ip2_convolve3x3.rs (renamed from tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/convolve3x3.rs) | 0 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java b/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java index 7635e13..d4852f0 100644 --- a/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java +++ b/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/Convolve3x3.java @@ -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); diff --git a/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/convolve3x3.rs b/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/ip2_convolve3x3.rs index 13f9032..13f9032 100644 --- a/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/convolve3x3.rs +++ b/tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/ip2_convolve3x3.rs |