From 4c6c4db8b7f1f8468adec66547193d12b7280370 Mon Sep 17 00:00:00 2001 From: Suneet Agrawal Date: Wed, 24 Jul 2019 18:47:16 +0530 Subject: [PATCH] intermediate commit --- .../com/otaliastudios/cameraview/internal/egl/EglViewport.java | 2 +- .../com/otaliastudios/cameraview/preview/GlCameraPreview.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java index 0840de77..c9b21670 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/internal/egl/EglViewport.java @@ -122,7 +122,7 @@ public class EglViewport extends EglElement { } public void changeEffectFragmentShader(String fragmentShader){ - mProgramHandle = createProgram(SIMPLE_VERTEX_SHADER, fra); + mProgramHandle = createProgram(SIMPLE_VERTEX_SHADER, fragmentShader); } public void drawFrame(int textureId, float[] textureMatrix) { diff --git a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java index c88a921a..b2ec5c5a 100644 --- a/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java +++ b/cameraview/src/main/java/com/otaliastudios/cameraview/preview/GlCameraPreview.java @@ -7,6 +7,7 @@ import android.opengl.Matrix; import androidx.annotation.NonNull; import androidx.annotation.VisibleForTesting; +import android.util.Log; import android.view.LayoutInflater; import android.view.SurfaceHolder; import android.view.View;