projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[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 064bbec7bbc3632c7f7366a941521356812ae64c..13305b7f36a617dc421be1113174d755ae3180ce 100644
(file)
--- a/
src/lib/j2k_image_proxy.cc
+++ b/
src/lib/j2k_image_proxy.cc
@@
-43,9
+43,9
@@
using std::cout;
using std::max;
using std::pair;
using std::make_pair;
using std::max;
using std::pair;
using std::make_pair;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
using boost::optional;
using boost::optional;
-using
boost
::dynamic_pointer_cast;
+using
std
::dynamic_pointer_cast;
using dcp::ArrayData;
using dcp::raw_convert;
using dcp::ArrayData;
using dcp::raw_convert;
@@
-221,6
+221,7
@@
J2KImageProxy::J2KImageProxy (ArrayData data, dcp::Size size, AVPixelFormat pixe
: _data (new ArrayData(data))
, _size (size)
, _pixel_format (pixel_format)
: _data (new ArrayData(data))
, _size (size)
, _pixel_format (pixel_format)
+ , _error (false)
{
/* ::image assumes 16bpp */
DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);
{
/* ::image assumes 16bpp */
DCPOMATIC_ASSERT (_pixel_format == AV_PIX_FMT_RGB48 || _pixel_format == AV_PIX_FMT_XYZ12LE);