diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-03 16:12:50 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-03 16:12:50 +0100 |
| commit | 8c7829cd20778082a7a5ea612639c313f3006faa (patch) | |
| tree | 8ed057f8ee4d110ad2b3c81b1a701db597de59f0 /src | |
| parent | 568d433830710baa7b0c64a5b7491758beb95b1c (diff) | |
A few tweaks to dcpdiff.
Diffstat (limited to 'src')
| -rw-r--r-- | src/picture_asset.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/src/picture_asset.cc b/src/picture_asset.cc index f2982b47..a505dc63 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -364,13 +364,18 @@ PictureAsset::frame_buffer_equals ( double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size()); - if (mean > opt.max_mean_pixel_error || std_dev > opt.max_std_dev_pixel_error) { - note (ERROR, "mean or standard deviation out of range for " + lexical_cast<string>(frame)); + note (NOTE, "mean difference " + lexical_cast<string> (mean) + ", deviation " + lexical_cast<string> (std_dev)); + + if (mean > opt.max_mean_pixel_error) { + note (ERROR, "mean " + lexical_cast<string>(mean) + " out of range " + lexical_cast<string>(opt.max_mean_pixel_error) + " in frame " + lexical_cast<string>(frame)); + return false; + } + + if (std_dev > opt.max_std_dev_pixel_error) { + note (ERROR, "standard deviation " + lexical_cast<string>(std_dev) + " out of range " + lexical_cast<string>(opt.max_std_dev_pixel_error) + " in frame " + 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); |