Changeset 1243 in 3DVCSoftware for branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.h

Timestamp:

1 Jun 2015, 18:57:12 (9 years ago)

Author:

rwth

Message:

• fixed problem when NH_3D_DMM=0
• cleaned TEMP_SDC_CLEANUP

File:

• branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.h (modified) (1 diff)

branches/HTM-14.1-update-dev1-RWTH/source/Lib/TLibCommon/TComPrediction.h

@@ -170 +170 @@
   Void assignBiSegDCs             ( Pel* ptrDst, UInt dstStride, Bool* biSegPattern, Int patternStride, Pel valDC1, Pel valDC2 );
 #endif
-#if TEMP_SDC_CLEANUP // PM: consider this cleanup for SDC
 #if NH_3D_SDC_INTRA
   Void predConstantSDC            ( Pel* ptrSrc, UInt srcStride, UInt uiSize, Pel& predDC );
-#endif
-#else // PM: should be obsolete after cleanup
-#if NH_3D_SDC_INTRA
-  Void analyzeSegmentsSDC         ( Pel* pOrig, UInt uiStride, UInt uiSize, Pel* rpSegMeans, UInt uiNumSegments, Bool* pMask, UInt uiMaskStride, UInt uiIntraMode, Bool orgDC=false );
-#endif
 #endif