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_stab/db_vlvm | |
| 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_stab/db_vlvm')
| -rw-r--r-- | jni/feature_stab/db_vlvm/db_rob_image_homography.cpp | 3 | ||||
| -rw-r--r-- | jni/feature_stab/db_vlvm/db_utilities_linalg.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/jni/feature_stab/db_vlvm/db_rob_image_homography.cpp b/jni/feature_stab/db_vlvm/db_rob_image_homography.cpp index f40bef9..82dec0c 100644 --- a/jni/feature_stab/db_vlvm/db_rob_image_homography.cpp +++ b/jni/feature_stab/db_vlvm/db_rob_image_homography.cpp @@ -567,7 +567,8 @@ inline void db_ImageHomographyUpdateGeneric(double H_p_dx[9],double H[9],double void db_RobCamRotation_Polish_Generic(double H[9],int point_count,int homography_type,double *x_i,double *xp_i,double one_over_scale2, int max_iterations,double improvement_requirement) { - int i,update,stop,frozen_coord,n; + int i,update,stop,n; + int frozen_coord = 0; double lambda,cost,current_cost; double JtJ[72],min_Jtf[9],dx[8],H_p_dx[9]; double *JtJ_ref[9],d[8]; diff --git a/jni/feature_stab/db_vlvm/db_utilities_linalg.cpp b/jni/feature_stab/db_vlvm/db_utilities_linalg.cpp index 4147dce..8f68b30 100644 --- a/jni/feature_stab/db_vlvm/db_utilities_linalg.cpp +++ b/jni/feature_stab/db_vlvm/db_utilities_linalg.cpp @@ -80,7 +80,8 @@ subdiagonal part in A and diagonal in d, which is n-dimensional*/ void db_CholeskyDecompSeparateDiagonal(double **A,double *d,int n) { int i,j,k; - double s,temp; + double s; + double temp = 0.0; for(i=0;i<n;i++) for(j=i;j<n;j++) { |