Changeset 1313 in 3DVCSoftware for trunk/source/Lib/TLibCommon/ContextModel3DBuffer.h

Timestamp:

13 Aug 2015, 17:38:13 (9 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1@1312.

File:

• trunk/source/Lib/TLibCommon/ContextModel3DBuffer.h (modified) (4 diffs)

trunk/source/Lib/TLibCommon/ContextModel3DBuffer.h

@@ -2 +2 @@
  * License, included below. This software may be subject to other third party
  * and contributor rights, including patent rights, and no such rights are
- * granted under this license.  
+ * granted under this license.
  *
-* Copyright (c) 2010-2015, ITU/ISO/IEC
+ * Copyright (c) 2010-2015, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -36 +36 @@
 */
 
-#ifndef _HM_CONTEXT_MODEL_3DBUFFER_H_
-#define _HM_CONTEXT_MODEL_3DBUFFER_H_
+#ifndef __CONTEXTMODEL3DBUFFER__
+#define __CONTEXTMODEL3DBUFFER__
 
 #include <stdio.h>
-#include <assert.h>
 #include <memory.h>
 
@@ -61 +60 @@
   const UInt    m_sizeXY;       ///< X times Y size of 3D buffer
   const UInt    m_sizeXYZ;      ///< total size of 3D buffer
-  
+
 public:
   ContextModel3DBuffer  ( UInt uiSizeZ, UInt uiSizeY, UInt uiSizeX, ContextModel *basePtr, Int &count );
   ~ContextModel3DBuffer () {}
-  
+
   // access functions
   ContextModel& get( UInt uiZ, UInt uiY, UInt uiX )
@@ -79 +78 @@
     return &m_contextModel[ uiZ * m_sizeXY ];
   }
-  
+
   // initialization & copy functions
   Void initBuffer( SliceType eSliceType, Int iQp, UChar* ctxModel );          ///< initialize 3D buffer by slice type & QP
-  
+
   UInt calcCost( SliceType sliceType, Int qp, UChar* ctxModel );      ///< determine cost of choosing a probability table based on current probabilities
   /** copy from another buffer
    * \param src buffer to copy from
    */
-  Void copyFrom( ContextModel3DBuffer* src )
+  Void copyFrom( const ContextModel3DBuffer* src )
   {
     assert( m_sizeXYZ == src->m_sizeXYZ );