Changeset 697 in SHVCSoftware for branches

Timestamp:

18 Apr 2014, 22:06:41 (11 years ago)

Author:

seregin

Message:

fix compiler warnings

Location:

branches/SHM-6-dev/source

Files:

• App/TAppEncoder/TAppEncTop.cpp (modified) (1 diff)
• Lib/TLibCommon/SEI.h (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (2 diffs)
• Lib/TLibDecoder/TDecTop.h (modified) (1 diff)
• Lib/TLibEncoder/SEIwrite.h (modified) (1 diff)

branches/SHM-6-dev/source/App/TAppEncoder/TAppEncTop.cpp

@@ -481 +481 @@
     m_acTEncTop[layer].setTMISEIExtendedWhiteLevelLumaCodeValue     ( m_extendedWhiteLevelLumaCodeValue );
 #if Q0074_SEI_COLOR_MAPPING
-    string  cTmp  = m_acLayerCfg[layer].m_cSeiColorMappingFile;
-    m_acTEncTop[layer].setColorMappingInfoSEIFile                   ( cTmp.empty() ? NULL : strdup(cTmp.c_str()) );
+    m_acTEncTop[layer].setColorMappingInfoSEIFile                   ( m_acLayerCfg[layer].m_cSeiColorMappingFile.empty() ? NULL : const_cast<Char *>(m_acLayerCfg[layer].m_cSeiColorMappingFile.c_str()) );
 #endif
     m_acTEncTop[layer].setFramePackingArrangementSEIEnabled( m_framePackingSEIEnabled );

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;
-  UChar m_colorMap_primaries;
-  UChar m_colorMap_transfer_characteristics;
-  UChar m_colorMap_matrix_coeffs;
-  UChar 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;
+  UShort m_colorMap_primaries;
+  UShort m_colorMap_transfer_characteristics;
+  UShort m_colorMap_matrix_coeffs;
+  UShort m_colorMapModelId;
 
   Int   m_colour_map_coded_data_bit_depth;

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

@@ -2631 +2631 @@
     Int   cShift  = 1 ;
 
-    Pel*  LumPrev0 = Lum0;
+    //Pel*  LumPrev0 = Lum0;
     for( Int y = 0; y < iHeight ; y++ )
     {
@@ -2689 +2689 @@
       }
 
-      LumPrev0 = Lum0;
+      //LumPrev0 = Lum0;
       Lum0  += iStride;
       Lum1  += iStride;

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;
-  UChar m_colorMap_primaries;
-  UChar m_colorMap_transfer_characteristics;
-  UChar m_colorMap_matrix_coeffs;
-  UChar 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;
+  UShort m_colorMap_primaries;
+  UShort m_colorMap_transfer_characteristics;
+  UShort m_colorMap_matrix_coeffs;
+  UShort m_colorMapModelId;
 
   Int   m_colour_map_coded_data_bit_depth;

branches/SHM-6-dev/source/Lib/TLibEncoder/SEIwrite.h

@@ -73 +73 @@
   Void xWriteSEIToneMappingInfo(const SEIToneMappingInfo& sei);
 #if Q0074_SEI_COLOR_MAPPING
-  Void SEIWriter::xWriteSEIColorMappingInfo(const SEIColorMappingInfo& sei);
+  Void xWriteSEIColorMappingInfo(const SEIColorMappingInfo& sei);
 #endif
   Void xWriteSEISOPDescription(const SEISOPDescription& sei);