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

2 files changed, 1 insertions, 2 deletions

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() {