projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bfc79f8
)
Add some asserts.
author
Carl Hetherington
<cth@carlh.net>
Wed, 25 Jul 2018 12:53:52 +0000
(13:53 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 25 Jul 2018 12:53:52 +0000
(13:53 +0100)
src/lib/dcp_decoder.cc
patch
|
blob
|
history
diff --git
a/src/lib/dcp_decoder.cc
b/src/lib/dcp_decoder.cc
index 85fa41ddde0a9e5c1e7ce075a4013fb606961cfc..b9cb66a607c0bdd10c6c53a20596c42d93b3e3d8 100644
(file)
--- a/
src/lib/dcp_decoder.cc
+++ b/
src/lib/dcp_decoder.cc
@@
-195,12
+195,14
@@
DCPDecoder::pass_texts (ContentTime next)
{
list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
if ((*_reel)->main_subtitle()) {
{
list<shared_ptr<TextDecoder> >::const_iterator decoder = text.begin ();
if ((*_reel)->main_subtitle()) {
+ DCPOMATIC_ASSERT (decoder != text.end ());
pass_texts (
next, (*_reel)->main_subtitle()->asset(), _dcp_content->reference_text(TEXT_OPEN_SUBTITLE), (*_reel)->main_subtitle()->entry_point(), *decoder
);
++decoder;
}
if ((*_reel)->closed_caption()) {
pass_texts (
next, (*_reel)->main_subtitle()->asset(), _dcp_content->reference_text(TEXT_OPEN_SUBTITLE), (*_reel)->main_subtitle()->entry_point(), *decoder
);
++decoder;
}
if ((*_reel)->closed_caption()) {
+ DCPOMATIC_ASSERT (decoder != text.end ());
pass_texts (
next, (*_reel)->closed_caption()->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), (*_reel)->closed_caption()->entry_point(), *decoder
);
pass_texts (
next, (*_reel)->closed_caption()->asset(), _dcp_content->reference_text(TEXT_CLOSED_CAPTION), (*_reel)->closed_caption()->entry_point(), *decoder
);