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/AS_02_TimedText.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/AS_02_TimedText.cpp') diff --git a/src/AS_02_TimedText.cpp b/src/AS_02_TimedText.cpp index bd85737..5361029 100644 --- a/src/AS_02_TimedText.cpp +++ b/src/AS_02_TimedText.cpp @@ -96,7 +96,7 @@ AS_02::TimedText::MXFReader::h__Reader::MD_to_TimedText_TDesc(TimedTextDescripto TDesc.NamespaceName = TDescObj->NamespaceURI; TDesc.EncodingName = TDescObj->UCSEncoding; - Batch::const_iterator sdi = TDescObj->SubDescriptors.begin(); + Array::const_iterator sdi = TDescObj->SubDescriptors.begin(); TimedTextResourceSubDescriptor* DescObject = 0; Result_t result = RESULT_OK; @@ -203,8 +203,8 @@ AS_02::TimedText::MXFReader::h__Reader::ReadAncillaryResource(const Kumu::UUID& if ( KM_SUCCESS(result) ) { - Array::const_iterator pi; - RIP::Pair TmpPair; + RIP::const_pair_iterator pi; + RIP::PartitionPair TmpPair; ui32_t sequence = 0; // Look up the partition start in the RIP using the SID. @@ -602,7 +602,7 @@ AS_02::TimedText::MXFWriter::h__Writer::WriteAncillaryResource(const ASDCP::Time GSPart.BodySID = m_EssenceStreamID; GSPart.OperationalPattern = m_HeaderPart.OperationalPattern; - m_RIP.PairArray.push_back(RIP::Pair(m_EssenceStreamID++, here)); + m_RIP.PairArray.push_back(RIP::PartitionPair(m_EssenceStreamID++, here)); GSPart.EssenceContainers.push_back(UL(m_Dict->ul(MDD_TimedTextEssence))); UL TmpUL(m_Dict->ul(MDD_GenericStreamPartition)); Result_t result = GSPart.WriteToFile(m_File, TmpUL); -- cgit v1.2.3