projects
/
libsub.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
05b7376
)
Cope with libdcp1 API change.
author
Carl Hetherington
<cth@carlh.net>
Sat, 3 Jan 2015 22:04:03 +0000
(22:04 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 3 Jan 2015 22:04:03 +0000
(22:04 +0000)
src/dcp_reader.cc
patch
|
blob
|
history
diff --git
a/src/dcp_reader.cc
b/src/dcp_reader.cc
index 863cb68b12a350924f7c10e035caff046acbfb19..5ae00325c9cf7e10e69cbb9377233b7966167f7e 100644
(file)
--- a/
src/dcp_reader.cc
+++ b/
src/dcp_reader.cc
@@
-37,7
+37,7
@@
dcp_to_metric (dcp::Time t)
}
static Colour
-dcp_to_colour (dcp::Color c)
+dcp_to_colour (dcp::Colo
u
r c)
{
return Colour (float (c.r) / 255, float (c.g) / 255, float (c.b) / 255);
}
@@
-91,8
+91,8
@@
DCPReader::DCPReader (boost::filesystem::path file, bool interop)
break;
}
- sub.effect_colour = dcp_to_colour (i->effect_color ());
- sub.colour = dcp_to_colour (i->color ());
+ sub.effect_colour = dcp_to_colour (i->effect_colo
u
r ());
+ sub.colour = dcp_to_colour (i->colo
u
r ());
sub.italic = i->italic ();
_subs.push_back (sub);