projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use AV_ prefixes on some FFmpeg bits.
[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 9914887738bc5859eba5a21eec55e88f15ee56db..b6e684815b3e8cfcd346de91b60ad6b08ab28afd 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"
@@
-81,7
+83,7
@@
J2KImageProxy::J2KImageProxy (shared_ptr<cxml::Node> xml, shared_ptr<Socket> soc
shared_ptr<Image>
J2KImageProxy::image (optional<dcp::NoteHandler> note) const
{
shared_ptr<Image>
J2KImageProxy::image (optional<dcp::NoteHandler> note) const
{
- shared_ptr<Image> image (new Image (PIX_FMT_RGB48LE, _size, true));
+ shared_ptr<Image> image (new Image (
AV_
PIX_FMT_RGB48LE, _size, true));
shared_ptr<dcp::OpenJPEGImage> oj = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
shared_ptr<dcp::OpenJPEGImage> oj = dcp::decompress_j2k (const_cast<uint8_t*> (_data.data().get()), _data.size (), 0);
@@
-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)
+{
+
+}