Changeset 698 in SHVCSoftware for branches

Timestamp:

18 Apr 2014, 22:23:09 (12 years ago)

Author:

seregin

Message:

fix compiler warnings

Location:

branches/SHM-6-dev/source/Lib

Files:

• TLibCommon/SEI.h (modified) (1 diff)
• TLibDecoder/TDecTop.h (modified) (1 diff)

branches/SHM-6-dev/source/Lib/TLibCommon/SEI.h

@@ -417 +417 @@
   virtual ~SEIColorMappingInfo() {}
 
-  Int    m_colorMapId;
-  Bool   m_colorMapCancelFlag;
-  Bool   m_colorMapPersistenceFlag;
-  Bool   m_colorMap_video_signal_type_present_flag;
-  Bool   m_colorMap_video_full_range_flag;
-  UShort m_colorMap_primaries;
-  UShort m_colorMap_transfer_characteristics;
-  UShort m_colorMap_matrix_coeffs;
-  UShort m_colorMapModelId;
+  Int   m_colorMapId;
+  Bool  m_colorMapCancelFlag;
+  Bool  m_colorMapPersistenceFlag;
+  Bool  m_colorMap_video_signal_type_present_flag;
+  Bool  m_colorMap_video_full_range_flag;
+  Int   m_colorMap_primaries;
+  Int   m_colorMap_transfer_characteristics;
+  Int   m_colorMap_matrix_coeffs;
+  Int   m_colorMapModelId;
 
   Int   m_colour_map_coded_data_bit_depth;

branches/SHM-6-dev/source/Lib/TLibDecoder/TDecTop.h

@@ -67 +67 @@
 class TDecColorMapping
 {
-  Int    m_colorMapId;
-  Bool   m_colorMapCancelFlag;
-  Bool   m_colorMapPersistenceFlag;
-  Bool   m_colorMap_video_signal_type_present_flag;
-  Bool   m_colorMap_video_full_range_flag;
-  UShort m_colorMap_primaries;
-  UShort m_colorMap_transfer_characteristics;
-  UShort m_colorMap_matrix_coeffs;
-  UShort m_colorMapModelId;
+  Int   m_colorMapId;
+  Bool  m_colorMapCancelFlag;
+  Bool  m_colorMapPersistenceFlag;
+  Bool  m_colorMap_video_signal_type_present_flag;
+  Bool  m_colorMap_video_full_range_flag;
+  Int   m_colorMap_primaries;
+  Int   m_colorMap_transfer_characteristics;
+  Int   m_colorMap_matrix_coeffs;
+  Int   m_colorMapModelId;
 
   Int   m_colour_map_coded_data_bit_depth;