summaryrefslogtreecommitdiff
path: root/src/mono_picture_asset.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-12-01 14:55:54 +0000
committerCarl Hetherington <cth@carlh.net>2015-12-01 14:55:54 +0000
commit6e9b1b0ca5e839bda7b567b609cebb92a1cb95a7 (patch)
treebf4dc5244f62e754dfbe84d45a508917f477d0e7 /src/mono_picture_asset.cc
parent1a4b0d2c7978f45b415db2e9a0f1840aa114bcc9 (diff)
Check every picture frame when -k is passed to dcpdiff.
Diffstat (limited to 'src/mono_picture_asset.cc')
-rw-r--r--src/mono_picture_asset.cc9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/mono_picture_asset.cc b/src/mono_picture_asset.cc
index 91ab0d8a..f14e50c2 100644
--- a/src/mono_picture_asset.cc
+++ b/src/mono_picture_asset.cc
@@ -103,6 +103,8 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
shared_ptr<const MonoPictureAsset> other_picture = dynamic_pointer_cast<const MonoPictureAsset> (other);
DCP_ASSERT (other_picture);
+ bool result = true;
+
for (int i = 0; i < _intrinsic_duration; ++i) {
if (i >= other_picture->intrinsic_duration()) {
return false;
@@ -117,11 +119,14 @@ MonoPictureAsset::equals (shared_ptr<const Asset> other, EqualityOptions opt, No
frame_A->j2k_data(), frame_A->j2k_size(),
frame_B->j2k_data(), frame_B->j2k_size()
)) {
- return false;
+ result = false;
+ if (!opt.keep_going) {
+ return result;
+ }
}
}
- return true;
+ return result;
}
shared_ptr<PictureAssetWriter>