diff options
| author | jhurst <jhurst@cinecert.com> | 2006-04-05 23:03:55 +0000 |
|---|---|---|
| committer | jhurst <> | 2006-04-05 23:03:55 +0000 |
| commit | bfedf725dac9d13f3a02fe69f45c302ab29d2b1e (patch) | |
| tree | 4a746f759dcb62ebeb6309373e7579d6048f4af6 /src/JP2K_Codestream_Parser.cpp | |
| parent | fdf31e0105bf8272a6b7fa9c4039941dff37a271 (diff) | |
ginormo merge-back with Kumu, SMPTE MIC key and MPEG parser fix
Diffstat (limited to 'src/JP2K_Codestream_Parser.cpp')
| -rwxr-xr-x | src/JP2K_Codestream_Parser.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/JP2K_Codestream_Parser.cpp b/src/JP2K_Codestream_Parser.cpp index 216827b..700233f 100755 --- a/src/JP2K_Codestream_Parser.cpp +++ b/src/JP2K_Codestream_Parser.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2004, John Hurst +Copyright (c) 2004-2006, John Hurst All rights reserved. Redistribution and use in source and binary forms, with or without @@ -29,10 +29,12 @@ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \brief AS-DCP library, JPEG 2000 codestream essence reader implementation */ +#include <KM_fileio.h> #include <AS_DCP.h> -#include <FileIO.h> #include <JP2K.h> #include <assert.h> +#include <KM_log.h> +using Kumu::DefaultLogSink; //------------------------------------------------------------------------------------------ @@ -42,7 +44,7 @@ class ASDCP::JP2K::CodestreamParser::h__CodestreamParser public: PictureDescriptor m_PDesc; - FileReader m_File; + Kumu::FileReader m_File; h__CodestreamParser() { @@ -61,7 +63,7 @@ public: if ( ASDCP_SUCCESS(result) ) { - fsize_t file_size = m_File.Size(); + Kumu::fsize_t file_size = m_File.Size(); if ( FB.Capacity() < file_size ) { |