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


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/TComMv.h

    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 *
     
    5757  Short m_iHor;     ///< horizontal component of motion vector
    5858  Short m_iVer;     ///< vertical component of motion vector
    59 #if NH_3D_NBDV
     59#if NH_3D
    6060  Bool  m_bIDV;       
    6161  Short m_iIDVHor;   
     
    7272  m_iHor(0),
    7373  m_iVer(0)
    74 #if NH_3D_NBDV
     74#if NH_3D
    7575  , m_bIDV(false)
    7676  , m_iIDVHor(0)
     
    8484  m_iHor(iHor),
    8585  m_iVer(iVer)
    86  #if NH_3D_NBDV
     86 #if NH_3D
    8787  , m_bIDV(false)
    8888  , m_iIDVHor(0)
     
    100100  Void  setHor    ( Short i )                   { m_iHor = i;                               }
    101101  Void  setVer    ( Short i )                   { m_iVer = i;                               }
    102 #if NH_3D_NBDV
     102#if NH_3D
    103103  Void  setZero   ()                            { m_iHor = m_iVer = 0; m_bIDV = false; m_iIDVHor = m_iIDVVer = 0; m_iIDVVId = 0;  }
    104104  Void   setIDVHor  (Short i)                    {m_iIDVHor = i;}
     
    117117  Int   getAbsHor () const { return abs( m_iHor );   }
    118118  Int   getAbsVer () const { return abs( m_iVer );   }
    119 #if NH_3D_NBDV
     119#if NH_3D
    120120  Short getIDVHor () const { return m_iIDVHor;       }
    121121  Short getIDVVer () const { return m_iIDVVer;       }
Note: See TracChangeset for help on using the changeset viewer.