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

Merge "Reflected class name and bc file name changes."

Browse Source
This commit is contained in:
Ying Wang
2010-09-07 22:28:20 -07:00
committed by Android (Google) Code Review
parent 441fcf13f3 8dff092eca
commit db09da1071
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java
View File

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

6
libs/rs/java/tests/src/com/android/rs/test/RSTestCore.java
View File

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