diff options
| author | Carl Hetherington <cth@carlh.net> | 2013-06-02 23:03:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2013-06-02 23:03:08 +0100 |
| commit | a0856e3fbef17f24073b01cb96be6bbcb229ecbc (patch) | |
| tree | 13fd6191f2c4d82943cbcfa1f34688552cfc1f8e /src/lib/subtitle.h | |
| parent | e6d086fff404d9fe5ac080f9e75334eeb315c1da (diff) | |
| parent | 42866530db49e0faf367ad28a55c658be60951bf (diff) | |
Merge master.
Diffstat (limited to 'src/lib/subtitle.h')
| -rw-r--r-- | src/lib/subtitle.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h index 52bd35923..c3929d676 100644 --- a/src/lib/subtitle.h +++ b/src/lib/subtitle.h @@ -48,17 +48,17 @@ public: return _image; } - Rect area () const; + dvdomatic::Rect area () const; private: Position _position; boost::shared_ptr<Image> _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 ); /** A Subtitle class with details of the time over which it should be shown */ |