Changeset 1107 in 3DVCSoftware for branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder

Timestamp:

6 Nov 2014, 20:57:06 (10 years ago)

Author:

tech

Message:

Fixed linux compiler warnings.

Location:

branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder

Files:

• TEncCu.cpp (modified) (2 diffs)
• TEncSbac.cpp (modified) (2 diffs)

branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder/TEncCu.cpp

@@ -409 +409 @@
 
 #if H_3D_QTLPC
-  TComVPS *vps            = pcPic->getSlice(0)->getVPS();
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Bool  bLimQtPredFalg    = pcPic->getSlice(0)->getQtPredFlag(); 
 #else
+    TComVPS *vps            = pcPic->getSlice(0)->getVPS();
   Bool  bLimQtPredFalg    = vps->getLimQtPredFlag(pcPic->getSlice(0)->getLayerId()); 
 #endif
@@ -2204 +2204 @@
   UChar uhDepth = rpcTempCU->getDepth( 0 );
 #if H_3D_ARP
+#if !HHI_TOOL_PARAMETERS_I2_J0107
   Int iLayerId    = rpcTempCU->getSlice()->getLayerId();
+#endif
   Bool bFirstTime = true;
   Int nARPWMax    = rpcTempCU->getSlice()->getARPStepNum() - 1;

branches/HTM-12.2-dev2-HHI/source/Lib/TLibEncoder/TEncSbac.cpp

@@ -633 +633 @@
   PartSize eSize         = pcCU->getPartitionSize( uiAbsPartIdx );
 #if H_3D_QTLPC
-  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag();
 #else
+  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
   Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
 #endif
@@ -1010 +1010 @@
   Bool bCodeSplitFlag    = true;
 
-  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
+  
 #if HHI_TOOL_PARAMETERS_I2_J0107
   Bool    bLimQtPredFlag = pcCU->getPic()->getSlice(0)->getQtPredFlag(); 
 #else
+  TComVPS *vps           = pcCU->getPic()->getSlice(0)->getVPS();
   Bool    bLimQtPredFlag = vps->getLimQtPredFlag(pcCU->getPic()->getSlice(0)->getLayerId());
 #endif