From bfedf725dac9d13f3a02fe69f45c302ab29d2b1e Mon Sep 17 00:00:00 2001 From: jhurst Date: Wed, 5 Apr 2006 23:03:55 +0000 Subject: ginormo merge-back with Kumu, SMPTE MIC key and MPEG parser fix --- src/JP2K_Codestream_Parser.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/JP2K_Codestream_Parser.cpp') 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 #include -#include #include #include +#include +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 ) { -- cgit v1.2.3