Adapt for changes in parent branch, and test churn.

[libdcp.git] / src / smpte_subtitle_asset.cc

diff --git a/src/smpte_subtitle_asset.cc b/src/smpte_subtitle_asset.cc
index 81a0aa6f42093f26b7737a361b17a1ba53ce70d4..cf0ed6c0c38616f8f0ad16c733f6358b795d3dad 100644 (file)
--- a/src/smpte_subtitle_asset.cc
+++ b/src/smpte_subtitle_asset.cc
@@ -86,7 +86,11 @@ SMPTESubtitleAsset::SMPTESubtitleAsset (boost::filesystem::path file)
        shared_ptr<cxml::Document> xml (new cxml::Document ("SubtitleReel"));
 
        shared_ptr<ASDCP::TimedText::MXFReader> reader (new ASDCP::TimedText::MXFReader ());
-       Kumu::Result_t r = reader->OpenRead (_file->string().c_str ());
+       Kumu::Result_t r = Kumu::RESULT_OK;
+       {
+               ASDCPErrorSuspender sus;
+               r = reader->OpenRead (_file->string().c_str ());
+       }
        if (!ASDCP_FAILURE (r)) {
                /* MXF-wrapped */
                ASDCP::WriterInfo info;
@@ -393,7 +397,7 @@ SMPTESubtitleAsset::write (boost::filesystem::path p) const
 
        ASDCP::TimedText::MXFWriter writer;
        /* This header size is a guess.  Empirically it seems that each subtitle reference is 90 bytes, and we need some extra.
-          The defualt size is not enough for some feature-length PNG sub projects (see DCP-o-matic #1561).
+          The default size is not enough for some feature-length PNG sub projects (see DCP-o-matic #1561).
        */
        ASDCP::Result_t r = writer.OpenWrite (p.string().c_str(), writer_info, descriptor, _subtitles.size() * 90 + 16384);
        if (ASDCP_FAILURE (r)) {