diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java index 2fb82336..385ed99b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java @@ -103,7 +103,9 @@ public class DuotoneFilter extends BaseFilter implements TwoParameterFilter { @Override public float getParameter1() { - return (float) getFirstColor() / 0xFFFFFF; + int color = getFirstColor(); + color = Color.argb(0, Color.red(color), Color.green(color), Color.blue(color)); + return (float) color / 0xFFFFFF; } @Override @@ -114,7 +116,9 @@ public class DuotoneFilter extends BaseFilter implements TwoParameterFilter { @Override public float getParameter2() { - return (float) getSecondColor() / 0xFFFFFF; + int color = getSecondColor(); + color = Color.argb(0, Color.red(color), Color.green(color), Color.blue(color)); + return (float) color / 0xFFFFFF; } @NonNull diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java index 65316da0..3958c20f 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java @@ -66,7 +66,9 @@ public class TintFilter extends BaseFilter implements OneParameterFilter { @Override public float getParameter1() { - return (float) getTint() / 0xFFFFFF; + int color = getTint(); + color = Color.argb(0, Color.red(color), Color.green(color), Color.blue(color)); + return (float) color / 0xFFFFFF; } @NonNull diff --git a/demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java b/demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java index 672765a2..8b97aa4a 100644 --- a/demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java +++ b/demo/src/main/java/com/otaliastudios/cameraview/demo/CameraActivity.java @@ -331,7 +331,9 @@ public class CameraActivity extends AppCompatActivity implements View.OnClickLis } else { mCurrentFilter = 0; } - camera.setFilter(mAllFilters[mCurrentFilter].newInstance()); + Filters filter = mAllFilters[mCurrentFilter]; + camera.setFilter(filter.newInstance()); + message(filter.toString(), false); } @Override