Ticket #11: tmuc-issue11+fix.patch

source/Lib/TLibCommon/TComLoopFilter.cpp

@@ -383 +383 @@
     }
 }
 }
+#endif
 
 #if PLANAR_INTRA
 Void TComLoopFilter::xPelFilterPlanarIntra( Pel* piSrc, Int iOffset, Int iBlkSize )
@@ -475 +476 @@
   }
 }
 #endif
-#else
 
+#if !HHI_DEBLOCKING_FILTER && !TENTM_DEBLOCKING_FILTER
 Void TComLoopFilter::xSetEdgefilter( TComDataCU* pcCU, UInt uiAbsZorderIdx )
 {
   switch ( pcCU->getPartitionSize( uiAbsZorderIdx ) )

source/Lib/TLibCommon/TComLoopFilter.h

@@ -84 +84 @@
       return g_auiRasterToZscan[g_auiZscanToRaster[uiAbsZorderIdx] + iEdgeIdx * uiLCUWidthInBaseUnits + iBaseUnitIdx ];
   }
   Void xSetEdgefilterMultiple( TComDataCU* pcCU, UInt uiAbsZorderIdx, UInt uiDepth, Int iDir, Int iEdgeIdx, Bool bValue );
-#if PLANAR_INTRA
-  Void xPelFilterPlanarIntra      ( Pel* piSrc, Int iOffset, Int iBlkSize );
-  Void xEdgeFilterPlanarIntra     ( TComDataCU* pcCU, UInt uiAbsZorderIdx, Int iDir );
-#endif
 #else
   Void xSetEdgefilter             ( TComDataCU* pcCU, UInt uiAbsZorderIdx );
   Void xGetBoundaryStrength       ( TComDataCU* pcCU, UInt uiAbsZorderIdx, Int iDir, Int iEdge, UInt uiDepth );
@@ -97 +93 @@
   Void xEdgeFilterChroma          ( TComDataCU* pcCU, UInt uiAbsZorderIdx, Int iDir, Int iEdge );
 #endif
 
+#if PLANAR_INTRA
+  Void xPelFilterPlanarIntra      ( Pel* piSrc, Int iOffset, Int iBlkSize );
+  Void xEdgeFilterPlanarIntra     ( TComDataCU* pcCU, UInt uiAbsZorderIdx, Int iDir );
+#endif
+
 #if HHI_DEBLOCKING_FILTER
   Void xEdgeFilterLumaSingle      ( TComDataCU* pcCU, UInt uiAbsZorderIdx, Int iDir );
   Void xEdgeFilterChromaSingle    ( TComDataCU* pcCU, UInt uiAbsZorderIdx, Int iDir );