projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Formatting, variable name tidying and some const correctness.
[dcpomatic.git]
/
src
/
lib
/
dcp_video.cc
diff --git
a/src/lib/dcp_video.cc
b/src/lib/dcp_video.cc
index 204c390ee73285f0622dabab17d286ec0658feaa..3769a3285e552b9e40400e2513e79e920a499eb1 100644
(file)
--- a/
src/lib/dcp_video.cc
+++ b/
src/lib/dcp_video.cc
@@
-118,15
+118,17
@@
DCPVideo::convert_to_xyz (shared_ptr<const PlayerVideo> frame)
}
dcp::Size
}
dcp::Size
-DCPVideo::get_size(void) {
- auto image = _frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
+DCPVideo::get_size() const
+{
+ auto image = _frame->image(bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
return image->size();
}
return image->size();
}
-void
-DCPVideo::convert_to_xyz (uint16_t *dst) {
- auto image = _frame->image (bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
+void
+DCPVideo::convert_to_xyz(uint16_t* dst) const
+{
+ auto image = _frame->image(bind(&PlayerVideo::keep_xyz_or_rgb, _1), VideoRange::FULL, false);
if (_frame->colour_conversion()) {
dcp::rgb_to_xyz (
image->data()[0],
if (_frame->colour_conversion()) {
dcp::rgb_to_xyz (
image->data()[0],
@@
-138,6
+140,7
@@
DCPVideo::convert_to_xyz (uint16_t *dst) {
}
}
}
}
+
/** J2K-encode this frame on the local host.
* @return Encoded data.
*/
/** J2K-encode this frame on the local host.
* @return Encoded data.
*/