Changeset 125 in SHVCSoftware for trunk/source/Lib/TLibCommon/TComPicSym.h

Timestamp:

16 Apr 2013, 06:39:31 (12 years ago)

Author:

seregin

Message:

copy from HM-10.0-dev-SHM

File:

• trunk/source/Lib/TLibCommon/TComPicSym.h (modified) (5 diffs)

trunk/source/Lib/TLibCommon/TComPicSym.h

@@ -4 +4 @@
  * granted under this license.  
  *
- * Copyright (c) 2010-2012, ITU/ISO/IEC
+ * Copyright (c) 2010-2013, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -44 +44 @@
 #include "TComSlice.h"
 #include "TComDataCU.h"
-#if REMOVE_APS
 class TComSampleAdaptiveOffset;
-#endif
 
 //! \ingroup TLibCommon
@@ -110 +108 @@
   UInt*         m_puiInverseCUOrderMap;
 
-#if REMOVE_APS
   SAOParam *m_saoParam;
-#endif
 public:
   Void        create  ( Int iPicWidth, Int iPicHeight, UInt uiMaxWidth, UInt uiMaxHeight, UInt uiMaxDepth );
@@ -125 +121 @@
   UInt        getNumberOfCUsInFrame()   { return m_uiNumCUsInFrame;  }
   TComDataCU*&  getCU( UInt uiCUAddr )  { return m_apcTComDataCU[uiCUAddr];     }
-
+  
 #if AVC_SYNTAX
   UInt        getMaxCUWidth()           { return m_uiMaxCUWidth;                }
@@ -155 +151 @@
   Void         xInitTiles();
   UInt         xCalculateNxtCUAddr( UInt uiCurrCUAddr );
-#if REMOVE_APS
   Void allocSaoParam(TComSampleAdaptiveOffset *sao);
   SAOParam *getSaoParam() { return m_saoParam; }
-#endif
 };// END CLASS DEFINITION TComPicSym