From 1b2ad77a9fc777aa4c642a14785e086b4ee1f829 Mon Sep 17 00:00:00 2001 From: Stephen Hines Date: Wed, 6 Feb 2013 17:33:18 -0800 Subject: [PATCH] Rename convolve3x3.rs to prevent collisions. Change-Id: I9046348959d51fda6142e16f1226fed0c57a6d16 --- .../src/com/android/rs/image/Convolve3x3.java | 4 ++-- .../android/rs/image/{convolve3x3.rs => ip2_convolve3x3.rs} | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/{convolve3x3.rs => ip2_convolve3x3.rs} (100%) 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 7635e13d3f7d3..d4852f0bebed6 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 similarity index 100% rename from tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/convolve3x3.rs rename to tests/RenderScriptTests/ImageProcessing2/src/com/android/rs/image/ip2_convolve3x3.rs