Changeset 1386 in 3DVCSoftware for trunk/source/Lib/TAppCommon/TAppComCamPara.h

Timestamp:

13 Nov 2015, 16:29:39 (8 years ago)

Author:

tech

Message:

Merged 15.1-dev1@1381.

File:

• trunk/source/Lib/TAppCommon/TAppComCamPara.h (modified) (6 diffs)

trunk/source/Lib/TAppCommon/TAppComCamPara.h

@@ -67 +67 @@
   Bool                m_bCamParsCodedPrecSet;                 ///< Coded Cam Para precision set for current frame;
   
-#if H_3D_REN_MAX_DEV_OUT
+#if NH_3D_REN_MAX_DEV_OUT
   Double              m_dMaxShiftDeviation;                   ///< Maximum deviation of shifts with integer precision compare to double precision
 #endif
@@ -113 +113 @@
 
   // functions for reading, initialization, sorting, getting data, etc.
-  Void  xReadCameraParameterFile  ( Char* pchCfgFileName );
+  Void  xReadCameraParameterFile  ( TChar* pchCfgFileName );
   Bool  xGetCameraDataRow         ( Int iView, UInt uiFrame, UInt& ruiFoundLine );
 
@@ -129 +129 @@
 #endif
   Void  xSetupBaseViewsFromCoded  ();
-  Void  xSetupBaseViews           ( Char* pchBaseViewNumbers, UInt uiNumBaseViews );
+  Void  xSetupBaseViews           ( TChar* pchBaseViewNumbers, UInt uiNumBaseViews );
   Bool  xIsIn                     ( std::vector<Int>& rVec, Int iNumber);
 
@@ -156 +156 @@
                 UInt    uiStartFrameId,
                 UInt    uiNumFrames,
-                Char*   pchCfgFileName,
-                Char*   pchBaseViewNumbers,
-                Char*   pchSynthViewNumbers,
+                TChar*   pchCfgFileName,
+                TChar*   pchBaseViewNumbers,
+                TChar*   pchSynthViewNumbers,
                 std::vector<Int>* paiSynthViewNumbers,
                 Int     iLog2Precision );
@@ -165 +165 @@
                 UInt    uiStartFrameId,
                 UInt    uiNumFrames,
-                Char*   pchCfgFileName,
-                Char*   pchSynthViewNumbers,
+                TChar*   pchCfgFileName,
+                TChar*   pchSynthViewNumbers,
                 std::vector<Int>* paiSynthViewNumbers,
                 Int     iLog2Precision
@@ -183 +183 @@
   Int                 getRelDistLeft            ( Int iSynthViewIdx, Int   iLeftViewIdx, Int iRightViewIdx );
   UInt                getCurFrameId             ()  { return m_iCurrentFrameId;   }
-  static Void         convertNumberString       ( Char* pchViewNumberString, std::vector<Int>& raiViewNumbers, Double dViewNumPrec );
-#if H_3D_REN_MAX_DEV_OUT
+  static Void         convertNumberString       ( TChar* pchViewNumberString, std::vector<Int>& raiViewNumbers, Double dViewNumPrec );
+#if NH_3D_REN_MAX_DEV_OUT
   Double              getMaxShiftDeviation      () { return m_dMaxShiftDeviation; }; 
 #endif