Changeset 1413 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRom.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/TComRom.h (modified) (3 diffs)

trunk/source/Lib/TLibCommon/TComRom.h

@@ -4 +4 @@
  * granted under this license.
  *
- * Copyright (c) 2010-2016, ITU/ISO/IEC
+ * Copyright (c) 2010-2017, ITU/ISO/IEC
  * All rights reserved.
  *
@@ -39 +39 @@
 #include<stdio.h>
 #include<iostream>
-#if NH_3D_DMM
+#if NH_3D
 #include "TComWedgelet.h"
 #endif
@@ -91 +91 @@
 extern const UChar  g_aucIntraModeNumFast_NotUseMPM[MAX_CU_DEPTH];
 extern const UChar  g_chroma422IntraAngleMappingTable[NUM_INTRA_MODE];
-#if NH_3D_DMM
+#if NH_3D
 // ====================================================================================================================
 // Depth coding modes