diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-17 02:41:49 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-17 02:41:49 +0100 |
| commit | 5d2ba0d2f7855ffe18ff8e5a96156ca17e50cd2b (patch) | |
| tree | 0341572be05213e0dbfb94720577616d9e3b002f /src/lib/subtitle.cc | |
| parent | 7ef2ba523ca2ddc0470f5837bc88ad9c597361e2 (diff) | |
Windows apparently has Rectangle in the global namespace.
Diffstat (limited to 'src/lib/subtitle.cc')
| -rw-r--r-- | src/lib/subtitle.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc index dcb747828..451d83691 100644 --- a/src/lib/subtitle.cc +++ b/src/lib/subtitle.cc @@ -102,13 +102,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. */ -Rectangle +Rect subtitle_transformed_area ( float target_x_scale, float target_y_scale, - Rectangle sub_area, int subtitle_offset, float subtitle_scale + Rect sub_area, int subtitle_offset, float subtitle_scale ) { - Rectangle tx; + Rect tx; sub_area.y += subtitle_offset; @@ -137,8 +137,8 @@ subtitle_transformed_area ( } /** @return area that this subtitle take up, in the original uncropped source's coordinate space */ -Rectangle +Rect Subtitle::area () const { - return Rectangle (_position.x, _position.y, _image->size().width, _image->size().height); + return Rect (_position.x, _position.y, _image->size().width, _image->size().height); } |
