diff options
author | nicolasroard <nicolasroard@google.com> | 2012-10-08 16:38:19 -0700 |
---|---|---|
committer | nicolasroard <nicolasroard@google.com> | 2012-10-08 16:41:30 -0700 |
commit | 18ec21bd07b2f9ccf5a76c407303b3dacbb845fd (patch) | |
tree | fba9270616b39d79d6f8922172f615156eb4d713 /src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java | |
parent | 23c83737da80ba0b186440a8e649dfc8c5272eb0 (diff) | |
download | android_packages_apps_Snap-18ec21bd07b2f9ccf5a76c407303b3dacbb845fd.tar.gz android_packages_apps_Snap-18ec21bd07b2f9ccf5a76c407303b3dacbb845fd.tar.bz2 android_packages_apps_Snap-18ec21bd07b2f9ccf5a76c407303b3dacbb845fd.zip |
Fix crash introduced with the GeometryMetadata
bug:7224232
bug:7279964
bug:7298708
- Also remove the slide gesture (only use the slider widget)
- use scaleFactor to apply sharpen proportionally
Change-Id: Icce786cb53f2d3d6feada76c63108a563aaab7a3
Diffstat (limited to 'src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java')
-rw-r--r-- | src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java index 3ec7b5f70..d28e40517 100644 --- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java +++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java @@ -1,12 +1,6 @@ package com.android.gallery3d.filtershow.filters; -import android.graphics.Bitmap; -import android.util.Log; -import android.renderscript.Element; -import android.renderscript.Script; -import android.renderscript.ScriptC; - import com.android.gallery3d.R; public class ImageFilterSharpen extends ImageFilterRS { @@ -18,11 +12,13 @@ public class ImageFilterSharpen extends ImageFilterRS { mName = "Sharpen"; } - public void createFilter(android.content.res.Resources res) { + @Override + public void createFilter(android.content.res.Resources res, float scaleFactor, + boolean highQuality) { int w = mInPixelsAllocation.getType().getX(); int h = mInPixelsAllocation.getType().getY(); - float p1 = mParameter; + float p1 = mParameter * scaleFactor; float value = p1 / 100.0f; float f[] = new float[9]; float p = value; @@ -43,6 +39,7 @@ public class ImageFilterSharpen extends ImageFilterRS { mScript.set_gHeight(h); } + @Override public void runFilter() { mScript.set_gIn(mInPixelsAllocation); mScript.bind_gPixels(mInPixelsAllocation); |