updates for bulding with gcc 4.7.2 on Ubuntu 14.04

[asdcplib.git] / src / JP2K_Sequence_Parser.cpp

diff --git a/src/JP2K_Sequence_Parser.cpp b/src/JP2K_Sequence_Parser.cpp
index c33321e285cbb53b04732e140647b0198494c434..a0fd5d0b9c2fde47ac8143fe13a5cd5b1cd228b4 100755 (executable)
--- a/src/JP2K_Sequence_Parser.cpp
+++ b/src/JP2K_Sequence_Parser.cpp
@@ -59,7 +59,7 @@ public:
   }
 
   //
-  Result_t InitFromDirectory(const char* path)
+  Result_t InitFromDirectory(const std::string& path)
   {
     char next_file[Kumu::MaxFilePath];
     Kumu::DirScanner Scanner;
@@ -119,7 +119,7 @@ public:
     Close();
   }
 
-  Result_t OpenRead(const char* filename, bool pedantic);
+  Result_t OpenRead(const std::string& filename, bool pedantic);
   Result_t OpenRead(const std::list<std::string>& file_list, bool pedantic);
   void     Close() {}
 
@@ -168,9 +168,8 @@ ASDCP::JP2K::SequenceParser::h__SequenceParser::OpenRead()
 
 //
 ASDCP::Result_t
-ASDCP::JP2K::SequenceParser::h__SequenceParser::OpenRead(const char* filename, bool pedantic)
+ASDCP::JP2K::SequenceParser::h__SequenceParser::OpenRead(const std::string& filename, bool pedantic)
 {
-  ASDCP_TEST_NULL_STR(filename);
   m_Pedantic = pedantic;
 
   Result_t result = m_FileList.InitFromDirectory(filename);
@@ -327,7 +326,7 @@ ASDCP::JP2K::SequenceParser::~SequenceParser()
 // Opens the stream for reading, parses enough data to provide a complete
 // set of stream metadata for the MXFWriter below.
 ASDCP::Result_t
-ASDCP::JP2K::SequenceParser::OpenRead(const char* filename, bool pedantic) const
+ASDCP::JP2K::SequenceParser::OpenRead(const std::string& filename, bool pedantic) const
 {
   const_cast<ASDCP::JP2K::SequenceParser*>(this)->m_Parser = new h__SequenceParser;