projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge.
[libdcp.git]
/
src
/
picture_frame.cc
diff --git
a/src/picture_frame.cc
b/src/picture_frame.cc
index 06788da561646a5ce38283ad97657acc12c5d78a..a2b90a0b5d9786f0ab52e6878955061cfad01ba4 100644
(file)
--- a/
src/picture_frame.cc
+++ b/
src/picture_frame.cc
@@
-26,8
+26,8
@@
#include "lut.h"
#include "util.h"
#include "lut.h"
#include "util.h"
-using
namespace std
;
-using
namespace boost
;
+using
std::string
;
+using
boost::shared_ptr
;
using namespace libdcp;
/** Make a picture frame from a 2D (monoscopic) asset.
using namespace libdcp;
/** Make a picture frame from a 2D (monoscopic) asset.