From 40ecb821a29d1049e0a69149b20e552c7fbb0ae0 Mon Sep 17 00:00:00 2001 From: jhurst Date: Sat, 3 Feb 2018 19:41:49 +0000 Subject: Xerces 3 character data was being ignored. --- src/TimedText_Parser.cpp | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) (limited to 'src/TimedText_Parser.cpp') diff --git a/src/TimedText_Parser.cpp b/src/TimedText_Parser.cpp index 22d37bb..6b6d006 100644 --- a/src/TimedText_Parser.cpp +++ b/src/TimedText_Parser.cpp @@ -151,7 +151,12 @@ get_UUID_from_element(XMLElement* Element, UUID& ID) { assert(Element); const char* p = Element->GetBody().c_str(); - if ( strncmp(p, "urn:uuid:", 9) == 0 ) p += 9; + + if ( strncmp(p, "urn:uuid:", 9) == 0 ) + { + p += 9; + } + return ID.DecodeHex(p); } @@ -159,9 +164,15 @@ get_UUID_from_element(XMLElement* Element, UUID& ID) bool get_UUID_from_child_element(const char* name, XMLElement* Parent, UUID& outID) { - assert(name); assert(Parent); + assert(name); + assert(Parent); XMLElement* Child = Parent->GetChildWithName(name); - if ( Child == 0 ) return false; + + if ( Child == 0 ) + { + return false; + } + return get_UUID_from_element(Child, outID); } @@ -200,7 +211,7 @@ ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::OpenRead(const std::strin Result_t ASDCP::TimedText::DCSubtitleParser::h__SubtitleParser::OpenRead() { - if ( ! m_Root.ParseString(m_XMLDoc.c_str()) ) + if ( ! m_Root.ParseString(m_XMLDoc) ) return RESULT_FORMAT; m_TDesc.EncodingName = "UTF-8"; // the XML parser demands UTF-8 -- cgit v1.2.3