X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fsubtitle.cc;h=2815fccd8e19ce538b0e760506dd634ddd8e5728;hp=eafccd9b503651e2744bb53117c8c699e8c6bc0c;hb=a0856e3fbef17f24073b01cb96be6bbcb229ecbc;hpb=e6d086fff404d9fe5ac080f9e75334eeb315c1da diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc index eafccd9b5..2815fccd8 100644 --- a/src/lib/subtitle.cc +++ b/src/lib/subtitle.cc @@ -110,13 +110,13 @@ Subtitle::Subtitle (Position p, shared_ptr i) * 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, - 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; @@ -145,8 +145,8 @@ subtitle_transformed_area ( } /** @return area that this subtitle takes up, in the original uncropped source's coordinate space */ -Rect +dvdomatic::Rect 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); }