Changeset 724 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComRom.cpp

Timestamp:

30 Nov 2013, 12:29:49 (11 years ago)

Author:

tech

Message:

Merged HTM-8.2-dev0@723.

File:

• trunk/source/Lib/TLibCommon/TComRom.cpp (modified) (3 diffs)

trunk/source/Lib/TLibCommon/TComRom.cpp

@@ -604 +604 @@
 std::vector< std::vector<TComWedgeRef>  > g_dmmWedgeRefLists;
 std::vector< std::vector<TComWedgeNode> > g_dmmWedgeNodeLists;
+#if !SEC_DMM3_RBC_F0147
 std::vector< std::vector< std::vector<UInt> > > g_aauiWdgLstM3;
+#endif
 
 Void initWedgeLists( Bool initNodeList )
@@ -723 +725 @@
   }
 
+#if !SEC_DMM3_RBC_F0147
   UInt uiThrSz = DMM3_SIMPLIFY_TR;
   std::vector< std::vector<UInt> > auiWdgListSz;
@@ -739 +742 @@
   }
   g_aauiWdgLstM3.push_back(auiWdgListSz);
+#endif
 }