From f758bec505d45084d2563f20514ab4a81b27283a Mon Sep 17 00:00:00 2001 From: jhurst Date: Fri, 9 Oct 2015 23:41:11 +0000 Subject: o General review of Batch/Array distinction throughout the project o Fixed a bug that caused incorrect failure when parsing JPEG 2000 codestreams having fewer than five decomposition levels. o Fixed missing UUID generation in some instances of the MCALinkID property o Added -w option to asdcp-wrap to support use of WTF label with MCA --- src/h__02_Reader.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/h__02_Reader.cpp') diff --git a/src/h__02_Reader.cpp b/src/h__02_Reader.cpp index dd85330..cf2b00f 100644 --- a/src/h__02_Reader.cpp +++ b/src/h__02_Reader.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2011-2013, Robert Scheler, Heiko Sparenberg Fraunhofer IIS, +Copyright (c) 2011-2015, Robert Scheler, Heiko Sparenberg Fraunhofer IIS, John Hurst All rights reserved. @@ -77,7 +77,7 @@ AS_02::MXF::AS02IndexReader::InitFromFile(const Kumu::FileReader& reader, const body_part_array_t body_part_array; body_part_array_t::const_iterator body_part_iter; - ASDCP::MXF::Array::const_iterator i; + RIP::const_pair_iterator i; Result_t result = m_IndexSegmentData.Capacity(128*Kumu::Kilobyte); // will be grown if needed ui32_t first_body_sid = 0; @@ -429,7 +429,7 @@ AS_02::h__AS02Reader::OpenMXFRead(const char* filename) Kumu::fpos_t first_partition_after_header = 0; bool has_body_sid = false; - Array::iterator r_i; + RIP::pair_iterator r_i; for ( r_i = m_RIP.PairArray.begin(); r_i != m_RIP.PairArray.end(); ++r_i ) { -- cgit v1.2.3