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

Timestamp:

7 Apr 2015, 17:05:30 (9 years ago)

Author:

tech

Message:

Merged branch 13.1-dev0@1178.

File:

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

trunk/source/Lib/TAppCommon/TAppComCamPara.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2011, ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -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
@@ -145 +147 @@
   // 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:
@@ -216 +220 @@
   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;          }