summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/com/android/gallery3d/filtershow/FilterShowActivity.java12
-rw-r--r--src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java22
2 files changed, 28 insertions, 6 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
index 389973e50..d777b9f8b 100644
--- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java
+++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java
@@ -804,14 +804,14 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
mImageShow.setVisibility(View.VISIBLE);
mImageShow.setShowControls(true);
ImagePreset preset = mImageShow.getImagePreset();
- ImageFilter filter = preset.getFilter("Shadows");
+ ImageFilter filter = preset.getFilter("Vibrance");
if (filter == null) {
- ImageFilterShadows contrast = new ImageFilterShadows();
+ ImageFilterVibrance contrast = new ImageFilterVibrance();
ImagePreset copy = new ImagePreset(preset);
copy.add(contrast);
copy.setHistoryName(contrast.getName());
copy.setIsFx(false);
- filter = copy.getFilter("Shadows");
+ filter = copy.getFilter("Vibrance");
mImageShow.setImagePreset(copy);
}
mImageShow.setCurrentFilter(filter);
@@ -856,14 +856,14 @@ public class FilterShowActivity extends Activity implements OnItemClickListener,
mImageShow.setVisibility(View.VISIBLE);
mImageShow.setShowControls(true);
ImagePreset preset = mImageShow.getImagePreset();
- ImageFilter filter = preset.getFilter("Hue");
+ ImageFilter filter = preset.getFilter("Shadows");
if (filter == null) {
- ImageFilterHue contrast = new ImageFilterHue();
+ ImageFilterShadows contrast = new ImageFilterShadows();
ImagePreset copy = new ImagePreset(preset);
copy.add(contrast);
copy.setHistoryName(contrast.getName());
copy.setIsFx(false);
- filter = copy.getFilter("Hue");
+ filter = copy.getFilter("Shadows");
mImageShow.setImagePreset(copy);
}
mImageShow.setCurrentFilter(filter);
diff --git a/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
new file mode 100644
index 000000000..fd437ee8a
--- /dev/null
+++ b/src/com/android/gallery3d/filtershow/filters/ImageFilterVibrance.java
@@ -0,0 +1,22 @@
+
+package com.android.gallery3d.filtershow.filters;
+
+import android.graphics.Bitmap;
+
+public class ImageFilterVibrance extends ImageFilter {
+
+ public ImageFilterVibrance() {
+ mName = "Vibrance";
+ }
+
+ native protected void nativeApplyFilter(Bitmap bitmap, int w, int h, float bright);
+
+ @Override
+ public void apply(Bitmap bitmap) {
+ int w = bitmap.getWidth();
+ int h = bitmap.getHeight();
+ int p = mParameter;
+ float value = p;
+ nativeApplyFilter(bitmap, w, h, value);
+ }
+}