Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ede9972 authored by Ruei-sung Lin's avatar Ruei-sung Lin Committed by Yuli Huang
Browse files

parameter change to match api 

Cherry-pick to fix b/5339529.

Change-Id: Id84274e60c0feb8019f3418bd1f1feed0542ca51
parent 3264f438

src/com/android/gallery3d/photoeditor/filters/DoodleFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }

}

src/com/android/gallery3d/photoeditor/filters/FillLightFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }

}

src/com/android/gallery3d/photoeditor/filters/GrainFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }

}

src/com/android/gallery3d/photoeditor/filters/RotateFilter.java

+1 −1
Original line number Diff line number Diff line
@@ -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());

    }

}

src/com/android/gallery3d/photoeditor/filters/VignetteFilter.java

+3 −6
Original line number Diff line number Diff line
@@ -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());

    }

}