summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java8
-rw-r--r--libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java6
2 files changed, 7 insertions, 7 deletions
diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java b/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
index 4a4d837..75b8d33 100644
--- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
+++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
@@ -42,8 +42,8 @@ public class ImageProcessingActivity extends Activity
private Bitmap mBitmapOut;
private Bitmap mBitmapScratch;
private ScriptC_Threshold mScript;
- private ScriptC_Vertical_blur mScriptVBlur;
- private ScriptC_Horizontal_blur mScriptHBlur;
+ private ScriptC_VerticalBlur mScriptVBlur;
+ private ScriptC_HorizontalBlur mScriptHBlur;
private int mRadius = 0;
private SeekBar mRadiusSeekBar;
@@ -380,8 +380,8 @@ public class ImageProcessingActivity extends Activity
mScratchPixelsAllocation1 = Allocation.createTyped(mRS, tb.create());
mScratchPixelsAllocation2 = Allocation.createTyped(mRS, tb.create());
- mScriptVBlur = new ScriptC_Vertical_blur(mRS, getResources(), R.raw.vertical_blur, false);
- mScriptHBlur = new ScriptC_Horizontal_blur(mRS, getResources(), R.raw.horizontal_blur, false);
+ mScriptVBlur = new ScriptC_VerticalBlur(mRS, getResources(), R.raw.verticalblur, false);
+ mScriptHBlur = new ScriptC_HorizontalBlur(mRS, getResources(), R.raw.horizontalblur, false);
mScript = new ScriptC_Threshold(mRS, getResources(), R.raw.threshold, false);
mScript.set_width(mBitmapIn.getWidth());
diff --git a/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java b/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
index c1a16dd..eb1e48b 100644
--- a/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
+++ b/libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
@@ -30,10 +30,10 @@ public class RSTestCore {
private Resources mRes;
private RenderScriptGL mRS;
- private ScriptC_Test_root mRootScript;
+ private ScriptC_TestRoot mRootScript;
private boolean fp_mad() {
- ScriptC_Fp_mad s = new ScriptC_Fp_mad(mRS, mRes, R.raw.fp_mad, true);
+ ScriptC_FpMad s = new ScriptC_FpMad(mRS, mRes, R.raw.fpmad, true);
s.invoke_doTest(0, 0);
return true;
}
@@ -43,7 +43,7 @@ public class RSTestCore {
mRS = rs;
mRes = res;
- mRootScript = new ScriptC_Test_root(mRS, mRes, R.raw.test_root, true);
+ mRootScript = new ScriptC_TestRoot(mRS, mRes, R.raw.testroot, true);
fp_mad();