fix sharpen to work under the new system

Change-Id: I25518a05511c8b2279ba171bc3902e8cb3181c19

3 files changed, 27 insertions, 19 deletions

diff --git a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
index 9e3a0e252..1ea0da700 100644
--- a/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
+++ b/src/com/android/gallery3d/filtershow/editors/BasicEditor.java
@@ -34,15 +34,27 @@ public class BasicEditor extends Editor implements OnSeekBarChangeListener {
     public static int ID = R.id.basicEditor;
     private SeekBar mSeekBar;
     private final String LOGTAG = "Editor";
+    private int mLayoutID = R.layout.filtershow_default_editor;
+    private int mViewID = R.id.basicEditor;
 
     public BasicEditor() {
         super(ID);
     }
 
+    protected BasicEditor(int id) {
+        super(id);
+    }
+
+    protected BasicEditor(int id, int layoutID, int viewID) {
+        super(id);
+        int mLayoutID = layoutID;
+        int mViewID = viewID;
+    }
+
     @Override
     public void createEditor(Context context, FrameLayout frameLayout) {
         super.createEditor(context, frameLayout);
-        unpack(R.id.basicEditor, R.layout.filtershow_default_editor);
+        unpack(mViewID, mLayoutID);
         mSeekBar = (SeekBar) mView.findViewById(R.id.filterSeekBar);
         mSeekBar.setOnSeekBarChangeListener(this);
     }
diff --git a/src/com/android/gallery3d/filtershow/editors/EditorZoom.java b/src/com/android/gallery3d/filtershow/editors/EditorZoom.java
index b8642457d..ea8e3d140 100644
--- a/src/com/android/gallery3d/filtershow/editors/EditorZoom.java
+++ b/src/com/android/gallery3d/filtershow/editors/EditorZoom.java
@@ -16,22 +16,12 @@
 
 package com.android.gallery3d.filtershow.editors;
 
-import android.content.Context;
-import android.widget.FrameLayout;
-
 import com.android.gallery3d.R;
-import com.android.gallery3d.filtershow.imageshow.ImageZoom;
 
-public class EditorZoom extends Editor {
+public class EditorZoom extends BasicEditor {
     public static final int ID = R.id.imageZoom;
 
     public EditorZoom() {
-        super(ID);
-    }
-
-    @Override
-    public void createEditor(Context context, FrameLayout frameLayout) {
-        super.createEditor(context, frameLayout);
-        mView = mImageShow = new ImageZoom(context);
+        super(ID, R.layout.filtershow_zoom_editor,R.id.imageZoom);
     }
 }
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
index 1951b9b9e..1f9bf22c0 100644
--- a/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterSharpen.java
@@ -22,6 +22,7 @@ public class ImageFilterSharpen extends ImageFilterRS {
 
     private static final String LOGTAG = "ImageFilterSharpen";
     private ScriptC_convolve3x3 mScript;
+    float mScaleFactor;
 
     public ImageFilterSharpen() {
         mName = "Sharpen";
@@ -52,8 +53,17 @@ public class ImageFilterSharpen extends ImageFilterRS {
             boolean highQuality) {
         int w = mInPixelsAllocation.getType().getX();
         int h = mInPixelsAllocation.getType().getY();
+        mScaleFactor = scaleFactor;
 
-        float p1 = mParameter * scaleFactor;
+        if (mScript == null) {
+            mScript = new ScriptC_convolve3x3(getRenderScriptContext(), res, R.raw.convolve3x3);
+        }
+        mScript.set_gWidth(w);
+        mScript.set_gHeight(h);
+    }
+
+    private void computeKernel(){
+        float p1 = mParameter * mScaleFactor;
         float value = p1 / 100.0f;
         float f[] = new float[9];
         float p = value;
@@ -66,16 +76,12 @@ public class ImageFilterSharpen extends ImageFilterRS {
         f[6] = -p;
         f[7] = -p;
         f[8] = -p;
-        if (mScript == null) {
-            mScript = new ScriptC_convolve3x3(getRenderScriptContext(), res, R.raw.convolve3x3);
-        }
         mScript.set_gCoeffs(f);
-        mScript.set_gWidth(w);
-        mScript.set_gHeight(h);
     }
 
     @Override
     public void runFilter() {
+        computeKernel();
         mScript.set_gIn(mInPixelsAllocation);
         mScript.bind_gPixels(mInPixelsAllocation);
         mScript.forEach_root(mInPixelsAllocation, mOutPixelsAllocation);