Changeset 868 in 3DVCSoftware for branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

Timestamp:

25 Mar 2014, 12:11:22 (10 years ago)

Author:

tech

Message:

Merged fix from 10.0r1.

File:

• branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp (modified) (2 diffs)

branches/HTM-10.0-dev0/source/Lib/TLibCommon/TComDataCU.cpp

@@ -4718 +4718 @@
 
           TComMvField cMVField;
+#if !HTM10RC1_FIX
           UChar ucInterDir = pcTextureCU->getInterDir( uiPartIdx );
-
+#endif
           Int iDV = 0;
           Int iViewIdx = 0;
+#if !HTM10RC1_FIX
           if( ucInterDir & 1 )
           {
+#endif
               pcTextureCU->getMvField( pcTextureCU, uiPartIdx, REF_PIC_LIST_0, cMVField );
+#if HTM10RC1_FIX
+              if( cMVField.getRefIdx() >= 0 )
+              {
+#endif
               if( pcTextureSlice->getRefPOC( REF_PIC_LIST_0, cMVField.getRefIdx()) == pcTextureSlice->getPOC() )
               {
@@ -4744 +4751 @@
               }
           }
+
+#if !HTM10RC1_FIX
           if( !tmpDir && ( ucInterDir & 2 ))
           {
+#endif
               pcTextureCU->getMvField( pcTextureCU, uiPartIdx, REF_PIC_LIST_1, cMVField );
+
+#if HTM10RC1_FIX
+              if( !tmpDir && cMVField.getRefIdx() >= 0 )
+              {
+#endif
               if( pcTextureSlice->getRefPOC( REF_PIC_LIST_1, cMVField.getRefIdx()) == pcTextureSlice->getPOC() )
               {