Changeset 1119 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

Timestamp:

7 Jul 2015, 01:55:11 (9 years ago)

Author:

seregin

Message:

macro cleanup: O0096_REP_FORMAT_INDEX

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h (modified) (2 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComSlice.h

@@ -1618 +1618 @@
 #endif
 #if REPN_FORMAT_IN_VPS
-  Bool m_updateRepFormatFlag;
-#if O0096_REP_FORMAT_INDEX
+  Bool        m_updateRepFormatFlag;
   UInt        m_updateRepFormatIndex;
-#endif
 #endif
 #if SCALINGLIST_INFERRING
@@ -1794 +1792 @@
 #endif
 #if REPN_FORMAT_IN_VPS
-  Bool     getUpdateRepFormatFlag()       { return m_updateRepFormatFlag; }
-  Void     setUpdateRepFormatFlag(Bool x) { m_updateRepFormatFlag = x;    }
-#if O0096_REP_FORMAT_INDEX
-  Int      getUpdateRepFormatIndex()      { return m_updateRepFormatIndex; }
-  Void     setUpdateRepFormatIndex(UInt index)  { m_updateRepFormatIndex = index; }
-#endif
+  Bool     getUpdateRepFormatFlag()                 { return m_updateRepFormatFlag;   }
+  Void     setUpdateRepFormatFlag(Bool x)           { m_updateRepFormatFlag = x;      }
+  Int      getUpdateRepFormatIndex()                { return m_updateRepFormatIndex;  }
+  Void     setUpdateRepFormatIndex(UInt index)      { m_updateRepFormatIndex = index; }
 #endif
 #if SCALINGLIST_INFERRING
-  Bool     getInferScalingListFlag()  { return m_inferScalingListFlag;  }
-  UInt     getScalingListRefLayerId() { return m_scalingListRefLayerId; }
+  Bool     getInferScalingListFlag()                { return m_inferScalingListFlag;  }
+  UInt     getScalingListRefLayerId()               { return m_scalingListRefLayerId; }
   Void     setInferScalingListFlag( Bool flag )     { m_inferScalingListFlag = flag;     }
   Void     setScalingListRefLayerId( UInt layerId ) { m_scalingListRefLayerId = layerId; }