summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-04-16 13:36:20 +0100
committerCarl Hetherington <cth@carlh.net>2013-04-16 13:36:20 +0100
commit9ce517d0c789e0e1ef98f25e3449a75945fc62ab (patch)
treeaa7ddb932da092fbf9bc5562203cbbdd5d326681
parent034abb6bb0f1d0382620bdcc43501ce0ba30b03a (diff)
Add a couple of notes.
-rw-r--r--src/picture_asset.cc3
-rw-r--r--src/types.h3
-rw-r--r--tools/dcpdiff.cc2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/picture_asset.cc b/src/picture_asset.cc
index 4b775980..f2982b47 100644
--- a/src/picture_asset.cc
+++ b/src/picture_asset.cc
@@ -315,6 +315,7 @@ PictureAsset::frame_buffer_equals (
) const
{
if (size_A == size_B && memcmp (data_A, data_B, size_A) == 0) {
+ note (NOTE, "J2K identical");
/* Easy result; the J2K data is identical */
return true;
}
@@ -367,6 +368,8 @@ PictureAsset::frame_buffer_equals (
note (ERROR, "mean or standard deviation out of range for " + lexical_cast<string>(frame));
return false;
}
+
+ note (NOTE, "mean difference " + lexical_cast<string> (mean) + ", deviation " + lexical_cast<string> (std_dev));
opj_image_destroy (image_A);
opj_image_destroy (image_B);
diff --git a/src/types.h b/src/types.h
index 4c824080..928e6a30 100644
--- a/src/types.h
+++ b/src/types.h
@@ -109,7 +109,8 @@ struct EqualityOptions {
enum NoteType {
PROGRESS,
- ERROR
+ ERROR,
+ NOTE
};
/** @class Color
diff --git a/tools/dcpdiff.cc b/tools/dcpdiff.cc
index 7913c533..b4c58b36 100644
--- a/tools/dcpdiff.cc
+++ b/tools/dcpdiff.cc
@@ -26,7 +26,7 @@ help (string n)
void
note (NoteType t, string n)
{
- if (t == ERROR || (t == PROGRESS && verbose)) {
+ if (t == ERROR || verbose) {
cout << " " << n << "\n";
}
}