Changeset 1274 in 3DVCSoftware for branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComPicYuv.cpp

Timestamp:

14 Jul 2015, 12:31:09 (9 years ago)

Author:

tech

Message:

Merged HTM-14.1-update-dev3@1273.

File:

• branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComPicYuv.cpp (modified) (3 diffs)

branches/HTM-14.1-update-dev2/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -91 +91 @@
   m_iPicHeight        = iPicHeight;
 
-#if H_3D_IV_MERGE
+#if NH_3D_IV_MERGE
+  m_iCuWidth        = uiMaxCUWidth;
+  m_iCuHeight       = uiMaxCUHeight;
+
   m_iNumCuInWidth   = m_iPicWidth / m_iCuWidth;
   m_iNumCuInWidth  += ( m_iPicWidth % m_iCuWidth ) ? 1 : 0;
@@ -292 +295 @@
   fclose(pFile);
 }
-#if H_3D
-#if H_3D_IV_MERGE
+#if NH_3D_IV_MERGE
 Void
 TComPicYuv::getTopLeftSamplePos( Int iCuAddr, Int iAbsZorderIdx, Int& riX, Int& riY )
@@ -319 +321 @@
   riAbsZorderIdx      = g_auiRasterToZscan[ iRastPartIdx ];
 }
-#endif
+
+#endif
+
+#if H_3D
 Void TComPicYuv::setLumaTo( Pel pVal )
 {