diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2012-01-11 10:37:11 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-01-11 10:37:11 +0100 |
| commit | 73ccde16e82fa9da0ee7c78e3fb1045b09f69c78 (patch) | |
| tree | 0aa52961608983662aff2bc41f50a2f4ac728b50 | |
| parent | 4d3003393602e8870e9139bfe290a85690f985c8 (diff) | |
| download | vdr-73ccde16e82fa9da0ee7c78e3fb1045b09f69c78.tar.gz vdr-73ccde16e82fa9da0ee7c78e3fb1045b09f69c78.tar.bz2 | |
Fixed cDvbSubtitleConverter::SetOsdData()
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | dvbsubtitle.c | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 3dcf6745..0b56b0d2 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1120,6 +1120,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi> for fixing handling DVB subtitles and implementing decoding textual DVB subtitles for adding file name and line number to LOG_ERROR_STR() for replacing all calls to sleep() with cCondWait::SleepMs() + for fixing cDvbSubtitleConverter::SetOsdData() Ralf Klueber <ralf.klueber@vodafone.com> for reporting a bug in cutting a recording if there is only a single editing mark @@ -6781,7 +6781,7 @@ Video Disk Recorder Revision History - Replaced all calls to sleep() with cCondWait::SleepMs() (thanks to Rolf Ahrenberg). - Fixed a crash with malformed SI data (patch from vdr-portal). -2012-01-07: Version 1.7.23 +2012-01-11: Version 1.7.23 - Removed the '.pl' suffix from svdrpsend.pl (sorry, I missed that one). - Fixed bonding more than two devices. @@ -6806,3 +6806,4 @@ Video Disk Recorder Revision History - cEvent::FixEpgBugs() now replaces any newline characters in stream component descriptions with blanks (thanks to Torsten Lang for reporting a problem with EPG data from BSkyB's "MTV MUSIC", S28.2E-2-2010-7012). +- Fixed cDvbSubtitleConverter::SetOsdData() (thanks to Rolf Ahrenberg). diff --git a/dvbsubtitle.c b/dvbsubtitle.c index 272950fa..c29277dd 100644 --- a/dvbsubtitle.c +++ b/dvbsubtitle.c @@ -7,7 +7,7 @@ * Original author: Marco Schlüßler <marco@lordzodiac.de> * With some input from the "subtitle plugin" by Pekka Virtanen <pekka.virtanen@sci.fi> * - * $Id: dvbsubtitle.c 2.20 2011/09/18 11:23:15 kls Exp $ + * $Id: dvbsubtitle.c 2.21 2012/01/11 10:34:07 kls Exp $ */ @@ -995,7 +995,7 @@ void cDvbSubtitleConverter::SetOsdData(void) double VideoAspect; cDevice::PrimaryDevice()->GetOsdSize(OsdWidth, OsdHeight, OsdAspect); cDevice::PrimaryDevice()->GetVideoSize(VideoWidth, VideoHeight, VideoAspect); - if (OsdWidth == displayWidth && OsdHeight == displayHeight || VideoWidth == 0) { + if (OsdWidth == displayWidth && OsdHeight == displayHeight || DoubleEqual(VideoAspect, 1.0)) { osdFactorX = osdFactorY = 1.0; osdDeltaX = osdDeltaY = 0; } |