Changeset 712 in 3DVCSoftware for branches/HTM-8.2-dev0/source/Lib/TLibCommon/TComRom.cpp

Timestamp:

21 Nov 2013, 13:28:24 (11 years ago)

Author:

tech

Message:

Merged DEV3 ( branch HTM-8.2-dev3-Samsung@699 )

File:

• branches/HTM-8.2-dev0/source/Lib/TLibCommon/TComRom.cpp (modified) (3 diffs)

branches/HTM-8.2-dev0/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
 }