diff options
| author | mbansal <mayank.bansal@sri.com> | 2011-08-19 10:18:54 -0400 |
|---|---|---|
| committer | Wei-Ta Chen <weita@google.com> | 2011-08-22 17:13:24 -0700 |
| commit | a6f0b9e759fa2d19d493bde7ffa8105ec2978b94 (patch) | |
| tree | 2d3c2db40c18b6efa4d58353e2553eabdaa1cd2c /jni/feature_mos | |
| parent | 6b39b2ad7aa425d4484703dd07fa3a86a248f4e9 (diff) | |
| download | LegacyCamera-a6f0b9e759fa2d19d493bde7ffa8105ec2978b94.zip LegacyCamera-a6f0b9e759fa2d19d493bde7ffa8105ec2978b94.tar.gz LegacyCamera-a6f0b9e759fa2d19d493bde7ffa8105ec2978b94.tar.bz2 | |
Updates to remove compile warnings and stop the viewfinder panning at UI boundary. Also, new logic for rendering the preview mosaic.
1) Fixed compiler warnings reported by Wei-Ta.
2) The viewfinder now stops panning (for both left-to-right and right-to-left motions) when it hits a pre-defined border region within the screen viewport.
3) Updated the logic for rendering to always maintain the preview mosaic (previewFBO) in the current-frame coordinate system. This fixes the repeating issues.
Change-Id: I6619ffe96955965ba523e330fa6561c88e6e6d5c
Diffstat (limited to 'jni/feature_mos')
| -rw-r--r-- | jni/feature_mos/src/mosaic/Blend.h | 1 | ||||
| -rwxr-xr-x | jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp | 1 | ||||
| -rwxr-xr-x | jni/feature_mos/src/mosaic_renderer/WarpRenderer.cpp | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/jni/feature_mos/src/mosaic/Blend.h b/jni/feature_mos/src/mosaic/Blend.h index 3e5b17c..b58eef9 100644 --- a/jni/feature_mos/src/mosaic/Blend.h +++ b/jni/feature_mos/src/mosaic/Blend.h @@ -38,7 +38,6 @@ #include <android/log.h> #define ANDROID_LOG_VERBOSE ANDROID_LOG_DEBUG #define LOG_TAG "CVJNI" -#define LOGV(...) __android_log_print(ANDROID_LOG_SILENT, LOG_TAG, __VA_ARGS__) #define LOGII(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__) #define LOGIE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__) #else diff --git a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp index e37406c..c547d4d 100755 --- a/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp +++ b/jni/feature_mos/src/mosaic_renderer/SurfaceTextureRenderer.cpp @@ -139,7 +139,6 @@ bool SurfaceTextureRenderer::DrawTexture(GLfloat *affine) glDrawElements(GL_TRIANGLE_STRIP, 4, GL_UNSIGNED_SHORT, g_iIndices2); glBindFramebuffer(GL_FRAMEBUFFER, 0); - glFinish(); succeeded = true; } while (false); return succeeded; diff --git a/jni/feature_mos/src/mosaic_renderer/WarpRenderer.cpp b/jni/feature_mos/src/mosaic_renderer/WarpRenderer.cpp index f1d5883..80eaa42 100755 --- a/jni/feature_mos/src/mosaic_renderer/WarpRenderer.cpp +++ b/jni/feature_mos/src/mosaic_renderer/WarpRenderer.cpp @@ -23,7 +23,7 @@ const int VERTEX_STRIDE = 6 * sizeof(GLfloat); GLushort g_iIndices[] = { 0, 1, 2, 3 }; WarpRenderer::WarpRenderer() : Renderer() - { +{ } WarpRenderer::~WarpRenderer() { |