am 833a89c6: Merge "Fix range on blur intrinsic." into jb-mr1-dev (4bc2bd51) · Commits · e / os / android_frameworks_base

graphics/java/android/renderscript/ScriptIntrinsicBlur.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -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);
		}

+7 −6

Original line number	Diff line number	Diff line
		@@ -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);
		}
		}
		}