Changeset 1373 in 3DVCSoftware for branches/HTM-15.2-dev/source/Lib/TLibCommon/TComRdCost.h

Timestamp:

6 Nov 2015, 16:18:36 (8 years ago)

Author:

tech

Message:

Macro fixes.

File:

• branches/HTM-15.2-dev/source/Lib/TLibCommon/TComRdCost.h (modified) (3 diffs)

branches/HTM-15.2-dev/source/Lib/TLibCommon/TComRdCost.h

@@ -46 +46 @@
 #include "TComSlice.h"
 #include "TComRdCostWeightPrediction.h"
-#if NH_3D
+#if NH_3D_VSO
 #include "../TLibRenderer/TRenModel.h"
 #include "TComYuv.h"
@@ -57 +57 @@
 class DistParam;
 class TComPattern;
-#if NH_3D
+#if NH_3D_VSO
 class TComRdCost; 
 #endif
@@ -68 +68 @@
 typedef Distortion (*FpDistFunc) (DistParam*); // TODO: can this pointer be replaced with a reference? - there are no NULL checks on pointer.
 
-#if NH_3D
+
 #if NH_3D_VSO
 typedef Dist (TComRdCost::*FpDistFuncVSO) ( Int, Int, Pel*, Int, Pel*, Int, UInt, UInt, Bool );
-#endif
 #endif
 // ====================================================================================================================