Changeset 1439 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon

Timestamp:

12 Aug 2015, 20:03:56 (10 years ago)

Author:

seregin

Message:

.update Xcode workspace
.fix vps_num_video_signal_info_minus1 inference

Patch-by: Karsten Suehring

Location:

branches/SHM-dev/source/Lib/TLibCommon

Files:

• TComSlice.cpp (modified) (1 diff)
• TComSlice.h (modified) (1 diff)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.cpp

@@ -3024 +3024 @@
 Int TComVPS::scalTypeToScalIdx( ScalabilityType scalType ) const
 {
-  assert( scalType >= 0 && scalType <= MAX_VPS_NUM_SCALABILITY_TYPES ); 
-  assert( scalType == MAX_VPS_NUM_SCALABILITY_TYPES || getScalabilityMask( scalType ) );
+  assert( (Int)scalType >= 0 && (Int)scalType <= MAX_VPS_NUM_SCALABILITY_TYPES ); 
+  assert( (Int)scalType == MAX_VPS_NUM_SCALABILITY_TYPES || getScalabilityMask( scalType ) );
   Int scalIdx = 0; 
   for( Int curScalType = 0; curScalType < scalType; curScalType++ )

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -717 +717 @@
   UInt                  m_treePartitionLayerIdList[MAX_LAYERS][MAX_LAYERS];
 
-  Int                   m_TolsIdx;
   Bool                  m_subLayerFlagInfoPresentFlag [MAX_VPS_OP_LAYER_SETS_PLUS1];
   Bool                  m_subLayerDpbInfoPresentFlag  [MAX_VPS_OP_LAYER_SETS_PLUS1][MAX_LAYERS];