summaryrefslogtreecommitdiffstats
path: root/graphics
diff options
context:
space:
mode:
authorJason Sams <jsams@google.com>2012-11-26 18:18:03 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-11-26 18:18:04 -0800
commitfdb36725acf0c5b8e540ed1522e02196018c45bb (patch)
treea9610808c89c4cb08a84c4d436d16f9ec9eb8e73 /graphics
parentb23858c0770a1a9f7055118810f10eba0c13121a (diff)
parent8150941098bcb44bbbb023c1f67760d69b31a16c (diff)
downloadframeworks_base-fdb36725acf0c5b8e540ed1522e02196018c45bb.zip
frameworks_base-fdb36725acf0c5b8e540ed1522e02196018c45bb.tar.gz
frameworks_base-fdb36725acf0c5b8e540ed1522e02196018c45bb.tar.bz2
Merge "Add single channel blur test."
Diffstat (limited to 'graphics')
-rw-r--r--graphics/java/android/renderscript/ScriptIntrinsicBlur.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java
index 11164e3..7ffd1e7 100644
--- a/graphics/java/android/renderscript/ScriptIntrinsicBlur.java
+++ b/graphics/java/android/renderscript/ScriptIntrinsicBlur.java
@@ -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)) {
+ if ((e != Element.U8_4(rs)) && e != (Element.U8(rs))) {
throw new RSIllegalArgumentException("Unsuported element type.");
}
int id = rs.nScriptIntrinsicCreate(5, e.getID(rs));