Changeset 1304 in 3DVCSoftware for branches/HTM-14.1-update-dev1/source/Lib/TLibCommon/TComPattern.h

Timestamp:

29 Jul 2015, 12:04:32 (10 years ago)

Author:

tech

Message:

Merged 14.1-update-dev1-LG@1303.

Location:

branches/HTM-14.1-update-dev1

Files:

• . (modified) (1 prop)
• source/Lib/TLibCommon/TComPattern.h (modified) (2 diffs)

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

@@ -84 +84 @@
   Bool              m_bICFlag;
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
   Bool              m_bSDCMRSADFlag;
 #endif
@@ -102 +102 @@
   Void  setICFlag( Bool bICFlag ) { m_bICFlag = bICFlag; }
 #endif
-#if H_3D_INTER_SDC
+#if NH_3D_SDC_INTER
   Bool  getSDCMRSADFlag()         { return m_bSDCMRSADFlag; }
   Void  setSDCMRSADFlag( Bool bSDCMRSADFlag )    { m_bSDCMRSADFlag = bSDCMRSADFlag; }