diff options
Diffstat (limited to 'src/com/android')
5 files changed, 7 insertions, 10 deletions
diff --git a/src/com/android/gallery3d/photoeditor/filters/DoodleFilter.java b/src/com/android/gallery3d/photoeditor/filters/DoodleFilter.java index b40f458bd..4b7b4c953 100644 --- a/src/com/android/gallery3d/photoeditor/filters/DoodleFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/DoodleFilter.java @@ -82,7 +82,7 @@ public class DoodleFilter extends Filter { } Effect effect = getEffect(context, EffectFactory.EFFECT_BITMAPOVERLAY); - effect.setParameter("doodle", bitmap); + effect.setParameter("bitmap", bitmap); effect.apply(src.texture(), src.width(), src.height(), dst.texture()); } } diff --git a/src/com/android/gallery3d/photoeditor/filters/FillLightFilter.java b/src/com/android/gallery3d/photoeditor/filters/FillLightFilter.java index a799e6f2a..29fab3cd8 100644 --- a/src/com/android/gallery3d/photoeditor/filters/FillLightFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/FillLightFilter.java @@ -42,7 +42,7 @@ public class FillLightFilter extends Filter { @Override public void process(EffectContext context, Photo src, Photo dst) { Effect effect = getEffect(context, EffectFactory.EFFECT_FILLLIGHT); - effect.setParameter("backlight", backlight); + effect.setParameter("strength", backlight); effect.apply(src.texture(), src.width(), src.height(), dst.texture()); } } diff --git a/src/com/android/gallery3d/photoeditor/filters/GrainFilter.java b/src/com/android/gallery3d/photoeditor/filters/GrainFilter.java index 1ee8a9c3f..191cb4416 100644 --- a/src/com/android/gallery3d/photoeditor/filters/GrainFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/GrainFilter.java @@ -42,7 +42,7 @@ public class GrainFilter extends Filter { @Override public void process(EffectContext context, Photo src, Photo dst) { Effect effect = getEffect(context, EffectFactory.EFFECT_GRAIN); - effect.setParameter("scale", scale); + effect.setParameter("strength", scale); effect.apply(src.texture(), src.width(), src.height(), dst.texture()); } } diff --git a/src/com/android/gallery3d/photoeditor/filters/RotateFilter.java b/src/com/android/gallery3d/photoeditor/filters/RotateFilter.java index 2823466d1..17f99fdab 100644 --- a/src/com/android/gallery3d/photoeditor/filters/RotateFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/RotateFilter.java @@ -40,7 +40,7 @@ public class RotateFilter extends Filter { dst.changeDimension(src.height(), src.width()); } Effect effect = getEffect(context, EffectFactory.EFFECT_ROTATE); - effect.setParameter("degree", degrees); + effect.setParameter("angle", (int) degrees); effect.apply(src.texture(), src.width(), src.height(), dst.texture()); } } diff --git a/src/com/android/gallery3d/photoeditor/filters/VignetteFilter.java b/src/com/android/gallery3d/photoeditor/filters/VignetteFilter.java index d066c8b7b..2c1597245 100644 --- a/src/com/android/gallery3d/photoeditor/filters/VignetteFilter.java +++ b/src/com/android/gallery3d/photoeditor/filters/VignetteFilter.java @@ -27,7 +27,7 @@ import com.android.gallery3d.photoeditor.Photo; */ public class VignetteFilter extends Filter { - private float range; + private float scale; /** * Sets the vignette range scale. @@ -35,17 +35,14 @@ public class VignetteFilter extends Filter { * @param scale ranges from 0 to 1. */ public void setScale(float scale) { - // The 'range' is between 1.3 to 0.6. When scale is zero then range is 1.3 - // which means no vignette at all because the luminousity difference is - // less than 1/256 and will cause nothing. - range = 1.30f - (float) Math.sqrt(scale) * 0.7f; + this.scale = scale; validate(); } @Override public void process(EffectContext context, Photo src, Photo dst) { Effect effect = getEffect(context, EffectFactory.EFFECT_VIGNETTE); - effect.setParameter("range", range); + effect.setParameter("scale", scale); effect.apply(src.texture(), src.width(), src.height(), dst.texture()); } } |