projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace hack with use of generic_string from boost::filesystem.
[libdcp.git]
/
src
/
picture_asset.cc
diff --git
a/src/picture_asset.cc
b/src/picture_asset.cc
index 625a0dd78394aa49d8d373583c46d248653b9088..8e7a1066ba7c6cbbf3f6b4b0e021ac650cb8b999 100644
(file)
--- a/
src/picture_asset.cc
+++ b/
src/picture_asset.cc
@@
-26,8
+26,8
@@
#include "compose.hpp"
#include "AS_DCP.h"
#include "KM_fileio.h"
#include "compose.hpp"
#include "AS_DCP.h"
#include "KM_fileio.h"
+#include "j2k.h"
#include <libxml++/nodes/element.h>
#include <libxml++/nodes/element.h>
-#include <openjpeg.h>
#include <boost/filesystem.hpp>
#include <list>
#include <stdexcept>
#include <boost/filesystem.hpp>
#include <list>
#include <stdexcept>
@@
-165,7
+165,7
@@
PictureAsset::frame_buffer_equals (
double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size());
double const std_dev = sqrt (double (total_squared_deviation) / abs_diffs.size());
- note (DCP_NOTE, String::compose ("mean difference %1
,
deviation %2", mean, std_dev));
+ note (DCP_NOTE, String::compose ("mean difference %1 deviation %2", mean, std_dev));
if (mean > opt.max_mean_pixel_error) {
note (
if (mean > opt.max_mean_pixel_error) {
note (