diff options
author | Stephen Hines <srhines@google.com> | 2013-01-23 18:38:42 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-01-23 18:38:42 +0000 |
commit | c2caaf8053376dbe0253dcd3d85873decce7fab6 (patch) | |
tree | 133476d61d99de60e9feb0b2ee1baa60dcbf3ac3 /src/com/android/gallery3d/filtershow | |
parent | c1a6a49b4364b5b3bd54c8c2dca377b8791a8172 (diff) | |
download | android_packages_apps_Snap-c2caaf8053376dbe0253dcd3d85873decce7fab6.tar.gz android_packages_apps_Snap-c2caaf8053376dbe0253dcd3d85873decce7fab6.tar.bz2 android_packages_apps_Snap-c2caaf8053376dbe0253dcd3d85873decce7fab6.zip |
Revert "Switch Gallery over to RS compatibility library."
This reverts commit 0746ce0977cde616d25ce35fee0d8d554235a21c
Change-Id: Ic0fb6c60e5f40b53ad032afeafe2f9ff70c26b50
Diffstat (limited to 'src/com/android/gallery3d/filtershow')
-rw-r--r-- | src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java | 8 | ||||
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java | 6 |
2 files changed, 9 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java index 802b556f9..a1dbe8e52 100644 --- a/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java +++ b/src/com/android/gallery3d/filtershow/cache/FilteringPipeline.java @@ -19,7 +19,9 @@ package com.android.gallery3d.filtershow.cache; import android.graphics.Bitmap; import android.os.*; import android.os.Process; -import android.support.v8.renderscript.*; +import android.renderscript.Allocation; +import android.renderscript.Allocation.MipmapControl; +import android.renderscript.RenderScript; import android.util.Log; import com.android.gallery3d.filtershow.filters.ImageFilterRS; @@ -142,13 +144,13 @@ public class FilteringPipeline implements Handler.Callback { mFiltersOnlyOriginalAllocation.destroy(); } mFiltersOnlyOriginalAllocation = Allocation.createFromBitmap(RS, mOriginalBitmap, - Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); + MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); if (mOriginalAllocation != null) { mOriginalAllocation.destroy(); } mResizedOriginalBitmap = preset.applyGeometry(mOriginalBitmap); mOriginalAllocation = Allocation.createFromBitmap(RS, mResizedOriginalBitmap, - Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); + MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); mPreviousGeometry = new GeometryMetadata(geometry); return true; } diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java index 368e29a78..63dc82c34 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterRS.java @@ -18,7 +18,9 @@ package com.android.gallery3d.filtershow.filters; import android.app.Activity; import android.graphics.Bitmap; -import android.support.v8.renderscript.*; +import android.renderscript.Allocation; +import android.renderscript.Allocation.MipmapControl; +import android.renderscript.RenderScript; import android.util.Log; public class ImageFilterRS extends ImageFilter { @@ -46,7 +48,7 @@ public class ImageFilterRS extends ImageFilter { } Bitmap bitmapBuffer = bitmap.copy(mBitmapConfig, true); mOutPixelsAllocation = Allocation.createFromBitmap(mRS, bitmapBuffer, - Allocation.MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); + MipmapControl.MIPMAP_NONE, Allocation.USAGE_SCRIPT); mInPixelsAllocation = Allocation.createTyped(mRS, mOutPixelsAllocation.getType()); sOldBitmap = bitmap; |