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

Merge "Fix range on blur intrinsic." into jb-mr1-dev

Browse Source
This commit is contained in:
Jason Sams
2012-10-03 16:02:42 -07:00
committed by Android (Google) Code Review
parent b8bb7a0e9c 31864d76a3
commit 833a89c694
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
graphics/java/android/renderscript/ScriptIntrinsicBlur.java
View File

@@ -69,13 +69,13 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic {
/**
* Set the radius of the Blur.
*
* Supported range 0-25
* Supported range 0 < radius <= 25
*
* @param radius The radius of the blur
*/
public void setRadius(float radius) {
if (radius < 0 || radius > 25) {
throw new RSIllegalArgumentException("Radius out of range (0-25).");
if (radius <= 0 || radius > 25) {
throw new RSIllegalArgumentException("Radius out of range (0 < r <= 25).");
}
setVar(0, radius);
}

13
tests/RenderScriptTests/ImageProcessing/src/com/android/rs/image/Blur25.java
View File

@@ -33,7 +33,7 @@ public class Blur25 extends TestBase {
private int MAX_RADIUS = 25;
private ScriptC_threshold mScript;
private int mRadius = MAX_RADIUS;
private float mRadius = MAX_RADIUS;
private float mSaturation = 1.0f;
private Allocation mScratchPixelsAllocation1;
private Allocation mScratchPixelsAllocation2;
@@ -51,13 +51,14 @@ public class Blur25 extends TestBase {
public void onBar1Changed(int progress) {
float fRadius = progress / 100.0f;
fRadius *= (float)(MAX_RADIUS);
mRadius = (int)fRadius;
mRadius = ((float)progress) / 100.0f * MAX_RADIUS;
if (mRadius <= 0.10f) {
mRadius = 0.10f;
}
if (mUseIntrinsic) {
mIntrinsic.setRadius(mRadius);
} else {
mScript.invoke_setRadius(mRadius);
mScript.invoke_setRadius((int)mRadius);
}
}
@@ -111,7 +112,7 @@ public class Blur25 extends TestBase {
if (mUseIntrinsic) {
mIntrinsic.setRadius(mRadius);
} else {
mScript.invoke_setRadius(mRadius);
mScript.invoke_setRadius((int)mRadius);
}
}
}