Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TAppCommon/TAppComCamPara.cpp

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/Lib/TAppCommon/TAppComCamPara.cpp (modified) (3 diffs)

trunk/source/Lib/TAppCommon/TAppComCamPara.cpp

@@ -49 +49 @@
 #include <functional>
 #include <string>
-#if H_3D
+#if NH_3D
 
 
@@ -1366 +1366 @@
 }
 
-#if H_3D_VSO
+#if NH_3D_VSO
 Void
 TAppComCamPara::setDispCoeff( UInt uiFrameId, Int iViewIdx )
@@ -1373 +1373 @@
   Int  iSourceViewNum = m_aiBaseViews[ iViewIdx ];
   Double dBaseLine = 0.0;
-  Double dFL1, dCS1, dCP1, dZN1, dZF1; 
-  Bool bInterpolated;
-  double dPos[3];
+  Double dFL1 = 1.0, dCS1 = 1.0, dCP1 = 1.0, dZN1 = 1.0, dZF1 = 1.0;
+  Bool bInterpolated = false;
+  double dPos[3] = {0.0, 0.0, 0.0};
 
   if( m_iNumberOfBaseViews == 3 )