diff options
author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-08-30 19:47:20 -0700 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-08-30 19:47:20 -0700 |
commit | 004f8683454e374b81788fd1a13d44c4d5f35bab (patch) | |
tree | ba212c5f402f7e924ffc12cee7958cf9e8ba181f /jni/feature_mos/src | |
parent | db15c114eda09196c982ae020dbb018d0d8919b1 (diff) | |
parent | b5533d51a7c97138235d29b35cec876d107aeadd (diff) | |
download | android_packages_apps_Snap-004f8683454e374b81788fd1a13d44c4d5f35bab.tar.gz android_packages_apps_Snap-004f8683454e374b81788fd1a13d44c4d5f35bab.tar.bz2 android_packages_apps_Snap-004f8683454e374b81788fd1a13d44c4d5f35bab.zip |
Merge "SnapdragonCamera: Sync LA.UM.6.4 to LA.UM.6.3"
Diffstat (limited to 'jni/feature_mos/src')
-rw-r--r-- | jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp | 2 | ||||
-rw-r--r-- | jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp index 4725463f2..2a7a1c2a0 100644 --- a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp +++ b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp @@ -16,7 +16,9 @@ #include "SurfaceTextureRenderer.h" +#include <string.h> #include <GLES2/gl2ext.h> + const GLfloat g_vVertices[] = { -1.f, -1.f, 0.0f, 1.0f, // Position 0 0.0f, 0.0f, // TexCoord 0 diff --git a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h index 9dbe9eb48..ea2b81ade 100644 --- a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h +++ b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.h @@ -8,7 +8,6 @@ #include <stdint.h> #include <stdio.h> #include <stdlib.h> -#include <string.h> class SurfaceTextureRenderer: public Renderer { public: |