Changeset 1442 in SHVCSoftware for branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

Timestamp:

13 Aug 2015, 19:11:53 (9 years ago)

Author:

seregin

Message:

port rev 4590

File:

• branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp (modified) (3 diffs)

branches/SHM-dev/source/Lib/TLibCommon/TComPicYuv.cpp

@@ -296 +296 @@
 
 // NOTE: This function is never called, but may be useful for developers.
-Void TComPicYuv::dump (const Char* pFileName, const BitDepths &bitDepths, Bool bAdd) const
-{
-  FILE* pFile;
-  if (!bAdd)
-  {
-    pFile = fopen (pFileName, "wb");
-  }
-  else
-  {
-    pFile = fopen (pFileName, "ab");
-  }
-
+Void TComPicYuv::dump (const std::string &fileName, const BitDepths &bitDepths, Bool bAdd) const
+{
+  FILE* pFile = fopen (fileName.c_str(), bAdd?"ab":"wb");
 
   for(Int comp = 0; comp < getNumberValidComponents(); comp++)
@@ -333 +324 @@
 }
 
-Void TComPicYuv::dump( Char* pFileName, Bool bAdd, Int bitDepth )
-{
-  FILE* pFile;
-  if (!bAdd)
-  {
-    pFile = fopen (pFileName, "wb");
-  }
-  else
-  {
-    pFile = fopen (pFileName, "ab");
-  }
+Void TComPicYuv::dump( const std::string &fileName, const Bool bAdd, const Int bitDepth )
+{
+  FILE* pFile = fopen (fileName.c_str(), bAdd?"ab":"wb");
 
   if( bitDepth == 8 )
   {
-    dump( pFileName, bitDepth, bAdd );
+    dump( fileName, bitDepth, bAdd );
     return;
   }
@@ -378 +361 @@
 
 #if AUXILIARY_PICTURES
-Void TComPicYuv::convertToMonochrome(Int bitDepthChroma)
+Void TComPicYuv::convertToMonochrome(const Int bitDepthChroma)
 {
   Pel grayVal = (1 << (bitDepthChroma - 1));