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

Timestamp:

10 Dec 2013, 13:50:12 (10 years ago)

Author:

tech

Message:

Merged HTM-9.0-dev0@731. (MV-HEVC 6 HLS)

File:

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

trunk/source/Lib/TLibCommon/TComRom.cpp

@@ -573 +573 @@
 #if H_MV_ENC_DEC_TRAC
 #if ENC_DEC_TRACE
+#if H_MV_FIX_TRACE_FILE
+Void writeToTraceFile( const Char* symbolName, Int val, Bool doIt )
+#else
 Void writeToTraceFile( Char* symbolName, Int val, Bool doIt )
+#endif
 {
   if ( ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) && doIt  ) 
@@ -588 +592 @@
 }
 
+#if H_MV_FIX_TRACE_FILE
+Void writeToTraceFile( const Char* symbolName, Bool doIt )
+#else
 Void writeToTraceFile( Char* symbolName, Bool doIt )
+#endif
 {
   if ( ( ( g_nSymbolCounter >= COUNTER_START && g_nSymbolCounter <= COUNTER_END )|| g_bJustDoIt ) && doIt  )