projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Logging improvements to allow prettier displays in the server GUI.
[dcpomatic.git]
/
src
/
lib
/
j2k_image_proxy.cc
diff --git
a/src/lib/j2k_image_proxy.cc
b/src/lib/j2k_image_proxy.cc
index ce0b88265ee8259e44b3cc3b93879c08b638d01a..303792b80f406e8e8417e401ed646f3410d10f81 100644
(file)
--- a/
src/lib/j2k_image_proxy.cc
+++ b/
src/lib/j2k_image_proxy.cc
@@
-28,6
+28,8
@@
#include <dcp/colour_conversion.h>
#include <dcp/rgb_xyz.h>
#include <libcxml/cxml.h>
#include <dcp/colour_conversion.h>
#include <dcp/rgb_xyz.h>
#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
+#include <iostream>
#include "i18n.h"
#include "i18n.h"
@@
-112,7
+114,7
@@
J2KImageProxy::image (optional<dcp::NoteHandler> note) const
} else {
dcp::xyz_to_rgb (oj, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
}
} else {
dcp::xyz_to_rgb (oj, dcp::ColourConversion::srgb_to_xyz(), image->data()[0], image->stride()[0], note);
}
-
+
return image;
}
return image;
}
@@
-148,3
+150,10
@@
J2KImageProxy::same (shared_ptr<const ImageProxy> other) const
return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0;
}
return memcmp (_data.data().get(), jp->_data.data().get(), _data.size()) == 0;
}
+
+J2KImageProxy::J2KImageProxy (Data data, dcp::Size size)
+ : _data (data)
+ , _size (size)
+{
+
+}