Changeset 296 in 3DVCSoftware for trunk/source/Lib/TLibCommon/TComWedgelet.cpp

Timestamp:

20 Feb 2013, 22:07:43 (12 years ago)

Author:

tech

Message:

Reintegrated branch 5.1-dev0 rev. 295.

File:

• trunk/source/Lib/TLibCommon/TComWedgelet.cpp (modified) (7 diffs)

trunk/source/Lib/TLibCommon/TComWedgelet.cpp

@@ -52 +52 @@
                                                             m_uhOri    ( 0 ),
                                                             m_eWedgeRes( FULL_PEL )
-#if HHIQC_DMMFASTSEARCH_B0039
+#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
                                                             , m_bIsCoarse( false )
 #endif
@@ -65 +65 @@
                                                             m_uhOri    ( rcWedge.m_uhOri     ),
                                                             m_eWedgeRes( rcWedge.m_eWedgeRes ),
-#if HHIQC_DMMFASTSEARCH_B0039
+#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
                                                             m_bIsCoarse( rcWedge.m_bIsCoarse ),
                                                             m_uiAng    ( rcWedge.m_uiAng     ),
@@ -101 +101 @@
 }
 
-#if HHIQC_DMMFASTSEARCH_B0039
+#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
 Void TComWedgelet::findClosetAngle()
 {
@@ -142 +142 @@
   m_uhOri     = uhOri;
   m_eWedgeRes = eWedgeRes;
-#if HHIQC_DMMFASTSEARCH_B0039
+#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
   m_bIsCoarse = bIsCoarse;
 #endif
@@ -687 +687 @@
   case( 2 ): { for( UInt iX = uiTempBlockSize-1; iX > uhXs;            iX-- ) { UInt iY = uiTempBlockSize-1; while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iY--; } } } break;
   case( 3 ): { for( UInt iY = uiTempBlockSize-1; iY > uhYs;            iY-- ) { UInt iX = 0;                 while( pbTempPattern[(iY * iTempStride) + iX] == false ) { pbTempPattern[(iY * iTempStride) + iX] = true; iX++; } } } break;
-#if HHIQC_DMMFASTSEARCH_B0039
+#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
   case( 4 ): 
     { 
@@ -721 +721 @@
       case( 2 ): { uiOffX = 1; uiOffY = 1; } break;
       case( 3 ): { uiOffX = 0; uiOffY = 1; } break;
-#if HHIQC_DMMFASTSEARCH_B0039
+#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
       case( 4 ): 
         { 
@@ -805 +805 @@
 }
 
-#if HHIQC_DMMFASTSEARCH_B0039
+#if HHI_DMM_PRED_TEX || HHI_DMM_WEDGE_INTRA
 TComWedgeNode::TComWedgeNode()
 {