From 3b9a8f9928c31483142ac5cf7138c2a4e8f30bec Mon Sep 17 00:00:00 2001 From: Mattia Iavarone Date: Sun, 12 Jan 2020 19:18:02 +0100 Subject: [PATCH] Add missing annotation --- .../java/com/otaliastudios/cameraview/filter/BaseFilter.java | 4 ++-- .../main/java/com/otaliastudios/cameraview/filter/Filter.java | 2 +- .../java/com/otaliastudios/cameraview/filter/MultiFilter.java | 2 +- .../com/otaliastudios/cameraview/filters/AutoFixFilter.java | 2 +- .../otaliastudios/cameraview/filters/BrightnessFilter.java | 2 +- .../com/otaliastudios/cameraview/filters/ContrastFilter.java | 2 +- .../otaliastudios/cameraview/filters/DocumentaryFilter.java | 2 +- .../com/otaliastudios/cameraview/filters/DuotoneFilter.java | 2 +- .../com/otaliastudios/cameraview/filters/FillLightFilter.java | 2 +- .../com/otaliastudios/cameraview/filters/GammaFilter.java | 2 +- .../com/otaliastudios/cameraview/filters/GrainFilter.java | 2 +- .../java/com/otaliastudios/cameraview/filters/HueFilter.java | 2 +- .../com/otaliastudios/cameraview/filters/LomoishFilter.java | 2 +- .../otaliastudios/cameraview/filters/SaturationFilter.java | 2 +- .../com/otaliastudios/cameraview/filters/SharpnessFilter.java | 2 +- .../otaliastudios/cameraview/filters/TemperatureFilter.java | 2 +- .../java/com/otaliastudios/cameraview/filters/TintFilter.java | 2 +- .../com/otaliastudios/cameraview/filters/VignetteFilter.java | 2 +- 18 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java index 5edd058a..2c3ef350 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/BaseFilter.java @@ -177,7 +177,7 @@ public abstract class BaseFilter implements Filter { } @Override - public void draw(long timestampUs, float[] transformMatrix) { + public void draw(long timestampUs, @NonNull float[] transformMatrix) { if (programHandle == -1) { LOG.w("Filter.draw() called after destroying the filter. " + "This can happen rarely because of threading."); @@ -188,7 +188,7 @@ public abstract class BaseFilter implements Filter { } } - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { // Copy the model / view / projection matrix over. GLES20.glUniformMatrix4fv(vertexModelViewProjectionMatrixLocation, 1, false, GlUtils.IDENTITY_MATRIX, 0); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java index b86fee50..9eb7ba31 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/Filter.java @@ -70,7 +70,7 @@ public interface Filter { * @param timestampUs timestamp in microseconds * @param transformMatrix matrix */ - void draw(long timestampUs, float[] transformMatrix); + void draw(long timestampUs, @NonNull float[] transformMatrix); /** * Called anytime the output size changes. diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/MultiFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/MultiFilter.java index aec28f65..116f4b2b 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filter/MultiFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filter/MultiFilter.java @@ -237,7 +237,7 @@ public class MultiFilter implements Filter, OneParameterFilter, TwoParameterFilt } @Override - public void draw(long timestampUs, float[] transformMatrix) { + public void draw(long timestampUs, @NonNull float[] transformMatrix) { synchronized (lock) { for (int i = 0; i < filters.size(); i++) { boolean isFirst = i == 0; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java index 8b7328f3..2d01e658 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/AutoFixFilter.java @@ -117,7 +117,7 @@ public class AutoFixFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); GLES20.glUniform1f(scaleLocation, scale); GlUtils.checkError("glUniform1f"); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java index 1cd6d2e6..3c453326 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/BrightnessFilter.java @@ -86,7 +86,7 @@ public class BrightnessFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); GLES20.glUniform1f(brightnessLocation, brightness); GlUtils.checkError("glUniform1f"); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java index ec790e96..c4054e16 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/ContrastFilter.java @@ -88,7 +88,7 @@ public class ContrastFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); GLES20.glUniform1f(contrastLocation, contrast); GlUtils.checkError("glUniform1f"); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java index a4f1bfc5..9e66c8d8 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DocumentaryFilter.java @@ -93,7 +93,7 @@ public class DocumentaryFilter extends BaseFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); float[] scale = new float[2]; if (mWidth > mHeight) { 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 ee534f23..f335c019 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/DuotoneFilter.java @@ -137,7 +137,7 @@ public class DuotoneFilter extends BaseFilter implements TwoParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); float[] first = new float[]{ Color.red(mFirstColor) / 255f, diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java index 399bab45..bf801474 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/FillLightFilter.java @@ -95,7 +95,7 @@ public class FillLightFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); float amount = 1.0f - strength; float multiplier = 1.0f / (amount * 0.7f + 0.3f); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java index c481ce83..4cef7017 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GammaFilter.java @@ -83,7 +83,7 @@ public class GammaFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); GLES20.glUniform1f(gammaLocation, gamma); GlUtils.checkError("glUniform1f"); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java index 2ee4b4f0..92df0d5f 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/GrainFilter.java @@ -138,7 +138,7 @@ public class GrainFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); GLES20.glUniform1f(strengthLocation, strength); GlUtils.checkError("glUniform1f"); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java index 0d790a25..54c6d93f 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/HueFilter.java @@ -96,7 +96,7 @@ public class HueFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); // map it on 360 degree circle float shaderHue = ((hue - 45) / 45f + 0.5f) * -1; diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LomoishFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LomoishFilter.java index 87196abc..411e1531 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LomoishFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/LomoishFilter.java @@ -141,7 +141,7 @@ public class LomoishFilter extends BaseFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); float[] scale = new float[2]; if (width > height) { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java index 32ef78a0..26d1b357 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SaturationFilter.java @@ -106,7 +106,7 @@ public class SaturationFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); if (scale > 0.0f) { GLES20.glUniform1f(scaleLocation, 0F); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java index 88b2ae76..5f100ebc 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/SharpnessFilter.java @@ -116,7 +116,7 @@ public class SharpnessFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); GLES20.glUniform1f(scaleLocation, scale); GlUtils.checkError("glUniform1f"); diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java index b6137e85..432b1e37 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TemperatureFilter.java @@ -94,7 +94,7 @@ public class TemperatureFilter extends BaseFilter implements OneParameterFilter } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); GLES20.glUniform1f(scaleLocation, scale); GlUtils.checkError("glUniform1f"); 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 51a00ecc..a5f8b146 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/TintFilter.java @@ -91,7 +91,7 @@ public class TintFilter extends BaseFilter implements OneParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); float[] channels = new float[]{ Color.red(tint) / 255f, diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java index df5089fa..fcdd3bf2 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/filters/VignetteFilter.java @@ -145,7 +145,7 @@ public class VignetteFilter extends BaseFilter implements TwoParameterFilter { } @Override - protected void onPreDraw(long timestampUs, float[] transformMatrix) { + protected void onPreDraw(long timestampUs, @NonNull float[] transformMatrix) { super.onPreDraw(timestampUs, transformMatrix); float[] scale = new float[2]; if (mWidth > mHeight) {