projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make a note in the log when XYZ values are clamped by libdcp on XYZ -> RGB conversion.
[dcpomatic.git]
/
src
/
lib
/
raw_image_proxy.cc
diff --git
a/src/lib/raw_image_proxy.cc
b/src/lib/raw_image_proxy.cc
index 7e0688d13eee5beacb75a1810d7997c3e934babb..8f05f54558301e45f895a338b5e74738e48e006e 100644
(file)
--- a/
src/lib/raw_image_proxy.cc
+++ b/
src/lib/raw_image_proxy.cc
@@
-30,16
+30,15
@@
extern "C" {
using std::string;
using boost::shared_ptr;
using std::string;
using boost::shared_ptr;
+using boost::optional;
-RawImageProxy::RawImageProxy (shared_ptr<Image> image, shared_ptr<Log> log)
- : ImageProxy (log)
- , _image (image)
+RawImageProxy::RawImageProxy (shared_ptr<Image> image)
+ : _image (image)
{
}
{
}
-RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket, shared_ptr<Log> log)
- : ImageProxy (log)
+RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> socket)
{
dcp::Size size (
xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
{
dcp::Size size (
xml->number_child<int> ("Width"), xml->number_child<int> ("Height")
@@
-50,7
+49,7
@@
RawImageProxy::RawImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
}
shared_ptr<Image>
}
shared_ptr<Image>
-RawImageProxy::image () const
+RawImageProxy::image (
optional<dcp::NoteHandler>
) const
{
return _image;
}
{
return _image;
}