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

Timestamp:

4 May 2015, 17:47:40 (9 years ago)

Author:

tech

Message:

Merged 14.0-dev0@1187.

File:

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

trunk/source/Lib/TAppCommon/TAppComCamPara.h

@@ -85 +85 @@
 
   // SPS and slice header related variables
-#if !HHI_CAM_PARA_K0052
-  std::vector<Int>    m_aiViewOrderIndex;                     ///< list of view order indices
-#endif
   UInt                m_uiCamParsCodedPrecision;              ///< precision for coding of camera parameters (x: max error in disparity is 2^(-x) luma samples)
   Bool                m_bCamParsVaryOverTime;                 ///< flag specifying whether camera parameters vary for given frame numbers
@@ -147 +144 @@
   // getting conversion parameters for disparity to virtual depth conversion
   Void  xGetCameraShifts          ( UInt uiSourceView, UInt uiTargetView, UInt uiFrame, Double& rdCamPosShift, Double& rdPicPosShift );
-#if !HHI_CAM_PARA_K0052
-  Void  xSetPdmConversionParams   ();
-#endif
 
 public:
@@ -220 +214 @@
   Bool                getVaryingCameraParameters()  { return m_bCamParsVaryOverTime;    }
   UInt                getCamParsCodedPrecision  ()  { return m_uiCamParsCodedPrecision; }
-#if !HHI_CAM_PARA_K0052
-  std::vector<Int>&   getViewOrderIndex         ()  { return m_aiViewOrderIndex;        }
-#endif
   Int**               getCodedScale             ()  { return m_aaiCodedScale;           }
   Int**               getCodedOffset            ()  { return m_aaiCodedOffset;          }