summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2015-01-26 22:17:23 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-26 22:17:23 +0000
commit8e2f0e48cb3d2209f1cf818b6cf8c4bd95645783 (patch)
tree2559401aaee226b7d60e61d5a390f77c446bac28
parent78f54e187b0acec1efcf58569b724f4c11b39653 (diff)
parent33e2880955ff459f976ae4ffe5aced65e0e25e53 (diff)
downloadpackages_apps_LegacyCamera-8e2f0e48cb3d2209f1cf818b6cf8c4bd95645783.zip
packages_apps_LegacyCamera-8e2f0e48cb3d2209f1cf818b6cf8c4bd95645783.tar.gz
packages_apps_LegacyCamera-8e2f0e48cb3d2209f1cf818b6cf8c4bd95645783.tar.bz2
am 33e28809: Merge "Add missing <string.h> include."
* commit '33e2880955ff459f976ae4ffe5aced65e0e25e53': Add missing <string.h> include.
-rwxr-xr-xjni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
index 88aac36..fa56402 100755
--- a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
+++ b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp
@@ -16,6 +16,8 @@
#include "SurfaceTextureRenderer.h"
+#include <string.h>
+
#include <GLES2/gl2ext.h>
const GLfloat g_vVertices[] = {
-1.f, -1.f, 0.0f, 1.0f, // Position 0