Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComPicYuv.h

Timestamp:

11 Jul 2018, 15:19:49 (7 years ago)

Author:

tech

Message:

Merged HTM-16.2-dev@1412

File:

• trunk/source/Lib/TLibCommon/TComPicYuv.h (modified) (3 diffs)

trunk/source/Lib/TLibCommon/TComPicYuv.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -80 +80 @@
 
   Bool  m_bIsBorderExtended;
-#if NH_3D_IV_MERGE
+#if NH_3D
   Int   m_iBaseUnitWidth;       ///< Width of Base Unit (with maximum depth or minimum size, m_iCuWidth >> Max. Depth)
   Int   m_iBaseUnitHeight;      ///< Height of Base Unit (with maximum depth or minimum size, m_iCuHeight >> Max. Depth)
@@ -189 +189 @@
 #endif
 #if NH_3D
-#if NH_3D_IV_MERGE
   // sample to block and block to sample conversion
   Void  getTopLeftSamplePos( Int iCuAddr, Int iAbsZorderIdx, Int& riX, Int& riY );
   Void  getCUAddrAndPartIdx( Int iX, Int iY, Int& riCuAddr, Int& riAbsZorderIdx );
-#endif
 #endif