Added downsampling filter.

Bug: 7690079
Change-Id: I235524127da848b1cbcca159cec43d1e0dcb5bf2

diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml
index 7b18d2d..2a2a795 100644 (file)
--- a/res/values/filtershow_ids.xml
+++ b/res/values/filtershow_ids.xml
@@ -33,4 +33,5 @@
     <item type="id" name="negativeButton" />
     <item type="id" name="edgeButton" />
     <item type="id" name="kmeansButton" />
+    <item type="id" name="downsampleButton" />
 </resources>

diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml
index 526982f..9d4bf95 100644 (file)
--- a/res/values/filtershow_strings.xml
+++ b/res/values/filtershow_strings.xml
@@ -140,6 +140,8 @@
     <!--  Label for an image effect that replicates the "pop art" style of segmenting
           images into solid colors, as popularized by Andy Warhol [CHAR LIMIT=10] -->
     <string name="kmeans">Warhol</string>
+    <!--  Label for the image downsampling effect (makes image smaller) [CHAR LIMIT=10] -->
+    <string name="downsample">Downsample</string>
 
     <!--  Labels for the curves tool -->
 

diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 1613219..079e5b1 100644 (file)
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -61,6 +61,7 @@ import com.android.gallery3d.filtershow.filters.ImageFilterBorder;
 import com.android.gallery3d.filtershow.filters.ImageFilterBwFilter;
 import com.android.gallery3d.filtershow.filters.ImageFilterContrast;
 import com.android.gallery3d.filtershow.filters.ImageFilterCurves;
+import com.android.gallery3d.filtershow.filters.ImageFilterDownsample;
 import com.android.gallery3d.filtershow.filters.ImageFilterEdge;
 import com.android.gallery3d.filtershow.filters.ImageFilterExposure;
 import com.android.gallery3d.filtershow.filters.ImageFilterFx;
@@ -313,7 +314,8 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
                 new ImageFilterBwFilter(),
                 new ImageFilterNegative(),
                 new ImageFilterEdge(),
-                new ImageFilterKMeans()
+                new ImageFilterKMeans(),
+                new ImageFilterDownsample()
         };
 
         for (int i = 0; i < filters.length; i++) {

diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
new file mode 100644 (file)
index 0000000..fa2293c
--- /dev/null
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterDownsample.java
@@ -0,0 +1,68 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.gallery3d.filtershow.filters;
+
+import android.graphics.Bitmap;
+
+import com.android.gallery3d.R;
+
+public class ImageFilterDownsample extends ImageFilter {
+
+    public ImageFilterDownsample() {
+        mName = "Downsample";
+        mMaxParameter = 100;
+        mMinParameter = 5;
+        mPreviewParameter = 10;
+        mDefaultParameter = 50;
+        mParameter = 50;
+    }
+
+    @Override
+    public int getButtonId() {
+        return R.id.downsampleButton;
+    }
+
+    @Override
+    public int getTextId() {
+        return R.string.downsample;
+    }
+
+    @Override
+    public boolean isNil() {
+        return false;
+    }
+
+    @Override
+    public Bitmap apply(Bitmap bitmap, float scaleFactor, boolean highQuality) {
+        int w = bitmap.getWidth();
+        int h = bitmap.getHeight();
+        int p = mParameter;
+        if (p > 0 && p < 100) {
+            int newWidth =  w * p / 100;
+            int newHeight = h * p / 100;
+            if (newWidth <= 0 || newHeight <= 0) {
+                return bitmap;
+            }
+            Bitmap ret = Bitmap.createScaledBitmap(bitmap, newWidth, newHeight, true);
+            if (ret != bitmap) {
+                bitmap.recycle();
+            }
+            return ret;
+        }
+        return bitmap;
+    }
+}