Changeset 1282 in SHVCSoftware

Timestamp:

16 Jul 2015, 04:16:56 (9 years ago)

Author:

seregin

Message:

address compiler warnings

Location:

branches/SHM-dev/source

Files:

• App/TAppDecoder/TAppDecCfg.h (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.cpp (modified) (1 diff)
• Lib/TLibDecoder/TDecTop.h (modified) (1 diff)

branches/SHM-dev/source/App/TAppDecoder/TAppDecCfg.h

@@ -129 +129 @@
 
 #if CONFORMANCE_BITSTREAM_MODE
-  Bool const getConfModeFlag() { return m_confModeFlag;  }
-  std::string const getConfPrefix() { return m_confPrefix;}
-  std::string const getMetadataFileName() { return m_metadataFileName; }
-  Bool const getMetadataFileRefresh() {return m_metadataFileRefresh; }
-  Void setMetadataFileRefresh(Bool const x) {m_metadataFileRefresh = x; }
-  Void setDecodedYuvLayerFileName(Int layerId, std::string x) {  m_decodedYuvLayerFileName[layerId] = x; }
-  std::string const getDecodedYuvLayerFileName(Int layerId) {  return m_decodedYuvLayerFileName[layerId]; }
-  Bool const getDecodedYuvLayerRefresh(Int const layerId) {return m_decodedYuvLayerRefresh[layerId]; }
-  Void setDecodedYuvLayerRefresh(Int const layerId, Bool const x) {m_decodedYuvLayerRefresh[layerId] = x; }
+  Bool        getConfModeFlag() const        { return m_confModeFlag;       }
+  std::string getConfPrefix() const          { return m_confPrefix;         }
+  std::string getMetadataFileName() const    { return m_metadataFileName;   }
+  Bool        getMetadataFileRefresh() const {return m_metadataFileRefresh; }
+
+  std::string getDecodedYuvLayerFileName(Int layerId) const        { return m_decodedYuvLayerFileName[layerId]; }
+  Bool        getDecodedYuvLayerRefresh(const Int layerId) const   { return m_decodedYuvLayerRefresh[layerId];  }
+
+  Void setMetadataFileRefresh(const Bool x)                        { m_metadataFileRefresh = x;              }
+  Void setDecodedYuvLayerFileName(Int layerId, std::string x)      { m_decodedYuvLayerFileName[layerId] = x; }
+  Void setDecodedYuvLayerRefresh(const Int layerId, const Bool x)  { m_decodedYuvLayerRefresh[layerId] = x;  }
 #endif
 #endif

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

@@ -1321 +1321 @@
         if( is16bit )
         {
-            uiPos <<= 1;
+          uiPos <<= 1;
         }
 

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

@@ -251 +251 @@
 
 #if CONFORMANCE_BITSTREAM_MODE
-  std::vector<TComPic>* getConfListPic() {return &m_confListPic; }
-  Bool      const getConfModeFlag() { return m_confModeFlag; }
-  Void      setConfModeFlag(Bool x) { m_confModeFlag = x; }
+  std::vector<TComPic>* getConfListPic() { return &m_confListPic; }
+  Bool      getConfModeFlag() const      { return m_confModeFlag; }
+  Void      setConfModeFlag(Bool x)      { m_confModeFlag = x;    }
 #endif
 #endif //SVC_EXTENSION