diff options
author | Tim Murray <timmurray@google.com> | 2013-03-14 21:19:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-14 21:19:52 +0000 |
commit | 8aa93945e2bc377261f39ac19e6968bc08a0b23b (patch) | |
tree | e9966a4d849b0201039224aa215e93e08ac5ebe7 /src | |
parent | 9a5247eeb3e0f606ed6fe02666b9edfc4a6b3f5f (diff) | |
parent | 2a7d821f5c6c3532f9bdf9bdd83b8853fa6666bc (diff) | |
download | android_packages_apps_Snap-8aa93945e2bc377261f39ac19e6968bc08a0b23b.tar.gz android_packages_apps_Snap-8aa93945e2bc377261f39ac19e6968bc08a0b23b.tar.bz2 android_packages_apps_Snap-8aa93945e2bc377261f39ac19e6968bc08a0b23b.zip |
Merge "Change element type to A_8 to support sampling." into gb-ub-photos-bryce
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java index 595aa9b30..3d355627e 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java @@ -144,12 +144,12 @@ public abstract class ImageFilterRS extends ImageFilter { } private static synchronized Allocation convertRGBAtoA(Bitmap bitmap) { - Type.Builder tb_a8 = new Type.Builder(sRS, Element.U8(sRS)); + Type.Builder tb_a8 = new Type.Builder(sRS, Element.A_8(sRS)); ScriptC_grey greyConvert = new ScriptC_grey(sRS, sRS.getApplicationContext().getResources(), R.raw.grey); Allocation bitmapTemp = convertBitmap(bitmap); - if (bitmapTemp.getType().getElement().isCompatible(Element.U8(sRS))) { + if (bitmapTemp.getType().getElement().isCompatible(Element.A_8(sRS))) { return bitmapTemp; } |