new log and fileio features

[asdcplib.git] / src / JP2K_Sequence_Parser.cpp

diff --git a/src/JP2K_Sequence_Parser.cpp b/src/JP2K_Sequence_Parser.cpp
index 8d1b63c1c90ee95f62ed92b2d9b24997b9db7121..5cb4e91adbfbbc20262f523c4b687788ff4f6e56 100755 (executable)
--- a/src/JP2K_Sequence_Parser.cpp
+++ b/src/JP2K_Sequence_Parser.cpp
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2004-2005, John Hurst
+Copyright (c) 2004-2009, John Hurst
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -30,8 +30,7 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include <AS_DCP.h>
-#include <FileIO.h>
-#include <DirScanner.h>
+#include <KM_fileio.h>
 #include <list>
 #include <string>
 #include <algorithm>
@@ -54,8 +53,8 @@ public:
   //
   Result_t InitFromDirectory(const char* path)
   {
-    char next_file[ASDCP_MAX_PATH];
-    DirScanner Scanner;
+    char next_file[Kumu::MaxFilePath];
+    Kumu::DirScanner Scanner;
 
     Result_t result = Scanner.Open(path);
 
@@ -139,13 +138,16 @@ ASDCP::JP2K::SequenceParser::h__SequenceParser::OpenRead(const char* filename)
       CodestreamParser Parser;
       FrameBuffer TmpBuffer;
 
-      fsize_t file_size = FileSize((*m_CurrentFile).c_str());
+      Kumu::fsize_t file_size = Kumu::FileSize((*m_CurrentFile).c_str());
 
       if ( file_size == 0 )
        result = RESULT_NOT_FOUND;
 
       if ( ASDCP_SUCCESS(result) )
-       result = TmpBuffer.Capacity(file_size);
+       {
+         assert(file_size <= 0xFFFFFFFFL);
+         result = TmpBuffer.Capacity((ui32_t) file_size);
+       }
 
       if ( ASDCP_SUCCESS(result) )
        result = Parser.OpenReadFrame((*m_CurrentFile).c_str(), TmpBuffer);