projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace aligned bool with enum Alignment.
[dcpomatic.git]
/
src
/
lib
/
dcp_video.cc
diff --git
a/src/lib/dcp_video.cc
b/src/lib/dcp_video.cc
index 4a505a7e18e65996b4666d59f541e67b0f993c06..9daeb45c8af0ce5afc46d9d7051d7335ba9b4362 100644
(file)
--- a/
src/lib/dcp_video.cc
+++ b/
src/lib/dcp_video.cc
@@
-59,19
+59,21
@@
DCPOMATIC_ENABLE_WARNINGS
#include "i18n.h"
#include "i18n.h"
+
using std::cout;
using std::make_shared;
using std::shared_ptr;
using std::string;
using std::cout;
using std::make_shared;
using std::shared_ptr;
using std::string;
-using dcp::Size;
using dcp::ArrayData;
using dcp::raw_convert;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
using dcp::ArrayData;
using dcp::raw_convert;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
#endif
+
#define DCI_COEFFICENT (48.0 / 52.37)
#define DCI_COEFFICENT (48.0 / 52.37)
+
/** Construct a DCP video frame.
* @param frame Input frame.
* @param index Index of the frame within the DCP.
/** Construct a DCP video frame.
* @param frame Input frame.
* @param index Index of the frame within the DCP.
@@
-103,7
+105,7
@@
DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame, dcp::NoteHandler
{
shared_ptr<dcp::OpenJPEGImage> xyz;
{
shared_ptr<dcp::OpenJPEGImage> xyz;
- auto image = frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL,
true
, false);
+ auto image = frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL,
Image::Alignment::PADDED
, false);
if (frame->colour_conversion()) {
xyz = dcp::rgb_to_xyz (
image->data()[0],
if (frame->colour_conversion()) {
xyz = dcp::rgb_to_xyz (
image->data()[0],