Changeset 535 in 3DVCSoftware for branches

Timestamp:

13 Jul 2013, 11:04:53 (11 years ago)

Author:

tech

Message:

Fixed compiler warning.

File:

• branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h (modified) (2 diffs)

branches/HTM-DEV-0.3-dev2/source/Lib/TLibCommon/TComSlice.h

@@ -1652 +1652 @@
   Int        m_viewIndex; 
   Bool       m_isDepth;
-  Int        m_aaiCodedScale [2][MAX_NUM_LAYERS];
-  Int        m_aaiCodedOffset[2][MAX_NUM_LAYERS];
-#if H_3D_TMVP
-  Int        m_aiAlterRefIdx   [2]; 
-#endif
-#if H_3D_ARP
-  TComList<TComPic*> * m_pBaseViewRefPicList[MAX_NUM_LAYERS];
-  UInt                 m_nARPStepNum; 
-#endif
-#if H_3D_IC
-  Bool      m_bApplyIC;
-  Bool      m_icSkipParseFlag;
-#endif
-
-#if H_3D_GEN
-  TComPic*   m_ivPicsCurrPoc [2][MAX_NUM_LAYERS];  
-  Int**      m_depthToDisparityB; 
-  Int**      m_depthToDisparityF; 
-#endif
-#endif
-#endif
-#if H_MV
+#endif
+
 // Additional slice header syntax elements 
   Bool       m_discardableFlag;
@@ -1686 +1666 @@
   Int        m_activeMotionPredRefLayerId   [ MAX_NUM_LAYER_IDS ];
 
+  Int        m_aaiCodedScale [2][MAX_NUM_LAYERS];
+  Int        m_aaiCodedOffset[2][MAX_NUM_LAYERS];
+#if H_3D_TMVP
+  Int        m_aiAlterRefIdx   [2]; 
+#endif
+#if H_3D_ARP
+  TComList<TComPic*> * m_pBaseViewRefPicList[MAX_NUM_LAYERS];
+  UInt                 m_nARPStepNum; 
+#endif
+#if H_3D_IC
+  Bool      m_bApplyIC;
+  Bool      m_icSkipParseFlag;
+#endif
+#if H_3D_GEN
+  TComPic*   m_ivPicsCurrPoc [2][MAX_NUM_LAYERS];  
+  Int**      m_depthToDisparityB; 
+  Int**      m_depthToDisparityF; 
+#endif
 #endif