Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4134ce33 authored Apr 01, 2013 by Tim Murray Committed by Android (Google) Code Review Apr 01, 2013

Merge "Fix blur intrinsic creation." into jb-mr2-dev

parents 53de5c29 bddc7ffb

graphics/java/android/renderscript/ScriptIntrinsicBlur.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -46,7 +46,7 @@ public final class ScriptIntrinsicBlur extends ScriptIntrinsic {
		* @return ScriptIntrinsicBlur
		*/
		public static ScriptIntrinsicBlur create(RenderScript rs, Element e) {
		if ((e != Element.U8_4(rs)) && e != (Element.U8(rs))) {
		if ((!e.isCompatible(Element.U8_4(rs))) && (!e.isCompatible(Element.U8(rs)))) {
		throw new RSIllegalArgumentException("Unsuported element type.");
		}
		int id = rs.nScriptIntrinsicCreate(5, e.getID(rs));

graphics/java/android/renderscript/ScriptIntrinsicColorMatrix.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,7 @@ public final class ScriptIntrinsicColorMatrix extends ScriptIntrinsic {
		* @return ScriptIntrinsicColorMatrix
		*/
		public static ScriptIntrinsicColorMatrix create(RenderScript rs, Element e) {
		if (e != Element.U8_4(rs)) {
		if (!e.isCompatible(Element.U8_4(rs))) {
		throw new RSIllegalArgumentException("Unsuported element type.");
		}
		int id = rs.nScriptIntrinsicCreate(2, e.getID(rs));

graphics/java/android/renderscript/ScriptIntrinsicConvolve3x3.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ public final class ScriptIntrinsicConvolve3x3 extends ScriptIntrinsic {
		*/
		public static ScriptIntrinsicConvolve3x3 create(RenderScript rs, Element e) {
		float f[] = { 0, 0, 0, 0, 1, 0, 0, 0, 0};
		if (e != Element.U8_4(rs)) {
		if (!e.isCompatible(Element.U8_4(rs))) {
		throw new RSIllegalArgumentException("Unsuported element type.");
		}
		int id = rs.nScriptIntrinsicCreate(1, e.getID(rs));