Changeset 210 in 3DVCSoftware for trunk/source/Lib/TLibRenderer

Timestamp:

11 Dec 2012, 18:52:43 (12 years ago)

Author:

tech

Message:

Reintegrated /branches/HTM-5.0-dev0 rev. 207.

Location:

trunk/source/Lib/TLibRenderer

Files:

• TRenModSetupStrParser.cpp (modified) (2 diffs)
• TRenModSetupStrParser.h (modified) (2 diffs)
• TRenModel.cpp (modified) (2 diffs)
• TRenModel.h (modified) (2 diffs)
• TRenSingleModel.cpp (modified) (2 diffs)
• TRenSingleModel.h (modified) (2 diffs)

trunk/source/Lib/TLibRenderer/TRenModSetupStrParser.cpp

@@ -36 +36 @@
 #include "TRenFilter.h"
 #include "TRenModSetupStrParser.h"
-
+#if !QC_MVHEVC_B0046
 Int
 TRenModSetupStrParser::getNumOfModels()
@@ -450 +450 @@
   rcNextChar = m_pchSetStr[iPos];
 }
+#endif
+

trunk/source/Lib/TLibRenderer/TRenModSetupStrParser.h

@@ -31 +31 @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
-
+#if !QC_MVHEVC_B0046
 #ifndef __TRENMODSETUPSTRPARSER__
 #define __TRENMODSETUPSTRPARSER__
@@ -127 +127 @@
 
 #endif //__TRENMODEL__
+#endif
+

trunk/source/Lib/TLibRenderer/TRenModel.cpp

@@ -35 +35 @@
 #include "TRenFilter.h"
 #include "TRenModel.h"
-
+#if !QC_MVHEVC_B0046
 ///////////  TRENMODEL //////////////////////
 TRenModel::TRenModel()
@@ -697 +697 @@
   }
 }
+#endif
+

trunk/source/Lib/TLibRenderer/TRenModel.h

@@ -32 +32 @@
  */
 
-
+#if !QC_MVHEVC_B0046
 #ifndef __TRENMODEL__
 #define __TRENMODEL__
@@ -156 +156 @@
 
 #endif //__TRENMODEL__
+#endif
+

trunk/source/Lib/TLibRenderer/TRenSingleModel.cpp

@@ -36 +36 @@
 #include "TRenSingleModel.h"
 
+#if !QC_MVHEVC_B0046
 ////////////// TRENSINGLE MODEL ///////////////
 template <BlenMod iBM, Bool bBitInc>
@@ -1956 +1957 @@
 }
 #endif
+#endif
+

trunk/source/Lib/TLibRenderer/TRenSingleModel.h

@@ -32 +32 @@
  */
 
-
-#ifndef __TRENSINGLEMODEL__
+#if !QC_MVHEVC_B0046
+#ifndef __TRENSINGLEMODEL__ 
 #define __TRENSINGLEMODEL__
 
@@ -391 +391 @@
 
 #endif //__TRENSINGLEMODEL__
+#endif
+