Changeset 769 in 3DVCSoftware for branches/HTM-9.2-dev0/source/Lib/TLibCommon/TComSlice.cpp

Timestamp:

13 Jan 2014, 08:05:57 (10 years ago)

Author:

tech

Message:

Further fixes.

File:

• branches/HTM-9.2-dev0/source/Lib/TLibCommon/TComSlice.cpp (modified) (8 diffs)

branches/HTM-9.2-dev0/source/Lib/TLibCommon/TComSlice.cpp

@@ -110 +110 @@
 #endif
 , m_pocResetFlag                  (false)
+#if H_MV
 , m_crossLayerBlaFlag             (false)
+#endif
 , m_discardableFlag               (false)
 , m_interLayerPredEnabledFlag     (false)
@@ -1699 +1701 @@
 , m_hrdOpSetIdx               (NULL)
 , m_cprmsPresentFlag          (NULL)
+#if H_MV
 , m_dpbSize                   (NULL)
-#if H_MV
 , m_vpsVUI                 (  NULL )
 #endif
@@ -1787 +1789 @@
     m_ivMvScalingFlag = true; 
 #endif
-#endif
 
     for( Int j = 0; j < MAX_NUM_LAYERS; j++ )
@@ -1808 +1809 @@
   m_vpsVUI = new TComVPSVUI; 
   m_dpbSize = new TComDpbSize; 
-#
+
 #if H_3D
   for( Int i = 0; i < MAX_NUM_LAYERS; i++ )
@@ -1831 +1832 @@
 #endif
   }  
+#endif
 #endif
 }
@@ -2211 +2213 @@
   ::memset(m_ltRefPicPocLsbSps, 0, sizeof(m_ltRefPicPocLsbSps));
   ::memset(m_usedByCurrPicLtSPSFlag, 0, sizeof(m_usedByCurrPicLtSPSFlag));
+#if H_MV
   m_spsExtensionFlag = false; 
   for( Int i = 0; i < PS_EX_T_MAX_NUM; i++ ) 
@@ -2230 +2233 @@
     m_scaledRefLayerBottomOffset   [i] = 0;
   }
+#endif
 }
 
@@ -3774 +3778 @@
 }
 #endif
-