diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-05-04 11:15:35 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-05-04 11:15:35 +0100 |
| commit | fca67f5661c55db6d4206cd17f4cdcf7ede865da (patch) | |
| tree | bd1d4f8fa6fa7befa30c78c646f636e31a6b3e80 /src/picture_asset.cc | |
| parent | af87bfc82beee0b0600558c84c3843dfd5a252f6 (diff) | |
| parent | a7bf2931ce47b1f3a2e4dbea0cf642d955619ac9 (diff) | |
Merge master.
Diffstat (limited to 'src/picture_asset.cc')
| -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 d98ef066..788e3dc4 100644 --- a/src/picture_asset.cc +++ b/src/picture_asset.cc @@ -368,13 +368,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); |