Changeset 1000 in 3DVCSoftware for branches/HTM-11.2-dev3-Sharp/source

Timestamp:

18 Jul 2014, 06:00:50 (10 years ago)

Author:

sharpjp-htm

Message:

Fix narrowing conversion of NumPocStCurr0,NumPocStCurr1 at TComSlice.cpp

Location:

branches/HTM-11.2-dev3-Sharp/source/Lib/TLibCommon

Files:

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

branches/HTM-11.2-dev3-Sharp/source/Lib/TLibCommon/TComSlice.cpp

@@ -647 +647 @@
   
   TComPic**             refPicSetStCurr    [2] = { RefPicSetStCurr0, RefPicSetStCurr1 };
+#if FIX_WARNING
+  Int numPocStCurr[2] = { (Int)NumPocStCurr0, (Int)NumPocStCurr1 }; 
+#else
   Int numPocStCurr[2] = { NumPocStCurr0, NumPocStCurr1 }; 
+#endif
 
   for (Int li = 0; li < ((m_eSliceType==B_SLICE) ? 2 : 1); li++)

branches/HTM-11.2-dev3-Sharp/source/Lib/TLibCommon/TypeDef.h

@@ -295 +295 @@
 #define H_3D_DIM_DLT                      1   // Depth Lookup Table
 #define HS_DMM_SIGNALLING_I0120  1   
+#define FIX_WARNING                       1   // fix narrowing conversion of NumPocStCurr0,NumPocStCurr1 at TComSlice.cpp
 
 #if H_3D_DIM_DLT