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


Ignore:
Timestamp:
11 Jul 2018, 15:19:49 (6 years ago)
Author:
tech
Message:

Merged HTM-16.2-dev@1412

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/source/Lib/TLibCommon/TComPicYuv.cpp

    r1405 r1413  
    44 * granted under this license.
    55 *
    6  * Copyright (c) 2010-2016, ITU/ISO/IEC
     6 * Copyright (c) 2010-2017, ITU/ISO/IEC
    77 * All rights reserved.
    88 *
     
    9393  m_picHeight         = picHeight;
    9494
    95 #if NH_3D_IV_MERGE
     95#if NH_3D
    9696  m_iCuWidth        = maxCUWidth;
    9797  m_iCuHeight       = maxCUHeight;
     
    141141  createWithoutCUInfo(picWidth, picHeight, chromaFormatIDC, bUseMargin, maxCUWidth, maxCUHeight);
    142142
    143 #if NH_3D_IV_MERGE
     143#if NH_3D
    144144  m_iBaseUnitWidth  = maxCUWidth  >> maxCUDepth;
    145145  m_iBaseUnitHeight = maxCUHeight >> maxCUDepth;
     
    350350  fclose(pFile);
    351351}
    352 #if NH_3D_IV_MERGE
     352#if NH_3D
    353353Void
    354354TComPicYuv::getTopLeftSamplePos( Int iCuAddr, Int iAbsZorderIdx, Int& riX, Int& riY )
Note: See TracChangeset for help on using the changeset viewer.