projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix empty (black) area calculations when video is set to not be used.
[dcpomatic.git]
/
src
/
lib
/
dcp.cc
diff --git
a/src/lib/dcp.cc
b/src/lib/dcp.cc
index 565b172291356156bd83091d7dcdc8f748341d38..477b61e9f4849dc0a1c620a7f3f35eb7f423d994 100644
(file)
--- a/
src/lib/dcp.cc
+++ b/
src/lib/dcp.cc
@@
-75,12
+75,12
@@
DCP::cpls () const
list<dcp::VerificationNote> notes;
dcp->read (¬es, true);
if (!_tolerant) {
list<dcp::VerificationNote> notes;
dcp->read (¬es, true);
if (!_tolerant) {
- /** We accept and ignore E
mptyAssetPathError
but everything else is bad */
+ /** We accept and ignore E
MPTY_ASSET_PATH and EXTERNAL_ASSET
but everything else is bad */
BOOST_FOREACH (dcp::VerificationNote j, notes) {
BOOST_FOREACH (dcp::VerificationNote j, notes) {
- if (j.code() == dcp::VerificationNote::EMPTY_ASSET_PATH) {
+ if (j.code() == dcp::VerificationNote::EMPTY_ASSET_PATH
|| j.code() == dcp::VerificationNote::EXTERNAL_ASSET
) {
LOG_WARNING("Empty path in ASSETMAP of %1", i.string());
} else {
LOG_WARNING("Empty path in ASSETMAP of %1", i.string());
} else {
- boost::throw_exception(dcp::
DCP
ReadError(dcp::note_to_string(j)));
+ boost::throw_exception(dcp::ReadError(dcp::note_to_string(j)));
}
}
}
}
}
}