projects
/
libdcp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
b05d262
)
Don't complain if SMPTE subtitle <LoadFont> URNs are different.
author
Carl Hetherington
<cth@carlh.net>
Wed, 10 Jun 2015 08:28:31 +0000
(09:28 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 10 Jun 2015 08:28:31 +0000
(09:28 +0100)
src/smpte_subtitle_asset.cc
patch
|
blob
|
history
diff --git
a/src/smpte_subtitle_asset.cc
b/src/smpte_subtitle_asset.cc
index 36908951251d228b43026bd4381d53cde490133b..dc0c86ada581f7daf18483cfef13db77c5ecf19a 100644
(file)
--- a/
src/smpte_subtitle_asset.cc
+++ b/
src/smpte_subtitle_asset.cc
@@
-284,7
+284,7
@@
SMPTESubtitleAsset::equals (shared_ptr<const Asset> other_asset, EqualityOptions
return false;
}
- if (
**i != **j
) {
+ if (
(*i)->id != (*j)->id
) {
note (DCP_ERROR, "<LoadFont> nodes differ");
return false;
}