Fixed calculating the OSD width and height

This commit is contained in:
Klaus Schmidinger 2004-06-12 14:04:01 +02:00
parent 8108d4587f
commit dcee5cb967
3 changed files with 8 additions and 3 deletions

View File

@ -1029,3 +1029,6 @@ Philip Lawatsch <philip@lawatsch.at>
Jouni Karvo <kex@netlab.hut.fi>
for suggesting to make the cOsd constructor 'protected'
Olaf Henkel <olafhenkel@t-online.de>
for reporting a problem with long event texts in the "Classic VDR" skin

View File

@ -2906,3 +2906,5 @@ Video Disk Recorder Revision History
UTF-8 before starting VDR.
- Some changes to the SPU decoder interface (thanks to Sven Goethel).
- Some improvements in cOsd creation (thanks to some suggestions by Jouni Karvo).
- Fixed calculating the OSD width and height (thanks to Olaf Henkel for reporting
a problem with long event texts in the "Classic VDR" skin).

6
osd.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
* $Id: osd.c 1.53 2004/06/12 13:24:42 kls Exp $
* $Id: osd.c 1.54 2004/06/12 13:59:12 kls Exp $
*/
#include "osd.h"
@ -622,8 +622,8 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas)
width = height = 0;
for (int i = 0; i < NumAreas; i++) {
bitmaps[numBitmaps++] = new cBitmap(Areas[i].Width(), Areas[i].Height(), Areas[i].bpp, Areas[i].x1, Areas[i].y1);
width = max(width, Areas[i].x2);
height = max(height, Areas[i].y2);
width = max(width, Areas[i].x2 + 1);
height = max(height, Areas[i].y2 + 1);
}
}
}