Changeset 931 in SHVCSoftware

Timestamp:

17 Dec 2014, 01:39:13 (10 years ago)

Author:

seregin

Message:

fix compiler warnings

Location:

branches/SHM-upgrade/source

Files:

• App/TAppDecoder/TAppDecTop.cpp (modified) (3 diffs)
• Lib/TLibDecoder/TDecGop.cpp (modified) (1 diff)

branches/SHM-upgrade/source/App/TAppDecoder/TAppDecTop.cpp

@@ -1436 +1436 @@
 
         TComDigest recon_digest;
-        calcMD5(*pic->getPicYuvRec(), recon_digest);
-        fprintf(fptr, "%8d%9d    MD5:%s\n", pic->getLayerId(), pic->getSlice(0)->getPOC(), digestToString(recon_digest, 16));
+        Int numChar = calcMD5(*pic->getPicYuvRec(), recon_digest);
+        fprintf(fptr, "%8d%9d    MD5:%s\n", pic->getLayerId(), pic->getSlice(0)->getPOC(), digestToString(recon_digest, numChar).c_str());
         fclose(fptr);
 
@@ -1461 +1461 @@
         yScal = TComSPS::getWinUnitY( chromaFormatIdc );
 #endif
-        std::vector<TComPic>::iterator iterPic;
-        for(iterPic = layerBuffer->begin(); iterPic != layerBuffer->end(); iterPic++)
-        {
-          TComPic checkPic = *iterPic;
+        std::vector<TComPic>::iterator itPic;
+        for(itPic = layerBuffer->begin(); itPic != layerBuffer->end(); itPic++)
+        {
+          TComPic checkPic = *itPic;
           if( checkPic.getPOC() <= pic->getPOC() )
           {
@@ -1473 +1473 @@
               conf.getWindowTopOffset()   * yScal + defDisp.getWindowTopOffset(),
               conf.getWindowBottomOffset()* yScal + defDisp.getWindowBottomOffset() );
-            layerBuffer->erase(iterPic);
-            iterPic = layerBuffer->begin();  // Ensure doesn't go to infinite loop
+            layerBuffer->erase(itPic);
+            itPic = layerBuffer->begin();  // Ensure doesn't go to infinite loop
             if(layerBuffer->size() == 0)
             {

branches/SHM-upgrade/source/Lib/TLibDecoder/TDecGop.cpp

@@ -55 +55 @@
 
 #if CONFORMANCE_BITSTREAM_MODE
-Bool pocCompareFunction( TComPic &pic1, TComPic &pic2 )
-{
-  return (pic1.getPOC() < pic2.getPOC());
+Bool pocCompareFunction( const TComPic &pic1, const TComPic &pic2 )
+{
+  return (const_cast<TComPic&>(pic1).getPOC() < const_cast<TComPic&>(pic2).getPOC());
 }
 #endif