projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
lib
/
subtitle.cc
diff --git
a/src/lib/subtitle.cc
b/src/lib/subtitle.cc
index eafccd9b503651e2744bb53117c8c699e8c6bc0c..2815fccd8e19ce538b0e760506dd634ddd8e5728 100644
(file)
--- a/
src/lib/subtitle.cc
+++ b/
src/lib/subtitle.cc
@@
-110,13
+110,13
@@
Subtitle::Subtitle (Position p, shared_ptr<Image> i)
* in the coordinate space of the source.
* @param subtitle_scale scaling factor to apply to the subtitle image.
*/
* in the coordinate space of the source.
* @param subtitle_scale scaling factor to apply to the subtitle image.
*/
-Rect
+
dvdomatic::
Rect
subtitle_transformed_area (
float target_x_scale, float target_y_scale,
subtitle_transformed_area (
float target_x_scale, float target_y_scale,
- Rect sub_area, int subtitle_offset, float subtitle_scale
+
dvdomatic::
Rect sub_area, int subtitle_offset, float subtitle_scale
)
{
)
{
- Rect tx;
+
dvdomatic::
Rect tx;
sub_area.y += subtitle_offset;
sub_area.y += subtitle_offset;
@@
-145,8
+145,8
@@
subtitle_transformed_area (
}
/** @return area that this subtitle takes up, in the original uncropped source's coordinate space */
}
/** @return area that this subtitle takes up, in the original uncropped source's coordinate space */
-Rect
+
dvdomatic::
Rect
Subtitle::area () const
{
Subtitle::area () const
{
- return Rect (_position.x, _position.y, _image->size().width, _image->size().height);
+ return
dvdomatic::
Rect (_position.x, _position.y, _image->size().width, _image->size().height);
}
}