frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed checking the last area for misalignment in cOsd::CanHandleAreas()

Browse Source
This commit is contained in:
Klaus Schmidinger 2004-07-17 13:46:15 +02:00
parent ec3f722a4f
commit a7a2bc6b06
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -859,6 +859,7 @@ Reinhard Nissl <rnissl@gmx.de>
channels.conf channels.conf
for adding cDevice::Flush() to make sure that all data in the video card's buffers for adding cDevice::Flush() to make sure that all data in the video card's buffers
has been processed has been processed
for reporting a bug in checking the last area for misalignment in cOsd::CanHandleAreas()
Richard Robson <richard_robson@beeb.net> Richard Robson <richard_robson@beeb.net>
for reporting freezing replay if a timer starts while in Transfer Mode from the for reporting freezing replay if a timer starts while in Transfer Mode from the

2
HISTORY
View File

@ -2945,3 +2945,5 @@ Video Disk Recorder Revision History
input. input.
- Fixed handling menu status messages when the list contents is scrolled (thanks - Fixed handling menu status messages when the list contents is scrolled (thanks
Alfred Zastrow for reporting this one). Alfred Zastrow for reporting this one).
- Fixed checking the last area for misalignment in cOsd::CanHandleAreas() (thanks
to Reinhard Nissl for reporting this one).

6
osd.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: osd.c 1.55 2004/06/15 20:29:42 kls Exp $ * $Id: osd.c 1.56 2004/07/17 13:39:30 kls Exp $
*/ */
#include "osd.h" #include "osd.h"
@ -603,11 +603,11 @@ cBitmap *cOsd::GetBitmap(int Area)
eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas) eOsdError cOsd::CanHandleAreas(const tArea *Areas, int NumAreas)
{ {
for (int i = 0; i < NumAreas; i++) { for (int i = 0; i < NumAreas; i++) {
if (Areas[i].x1 > Areas[i].x2 || Areas[i].y1 > Areas[i].y2 || Areas[i].x1 < 0 || Areas[i].y1 < 0)
return oeWrongAlignment;
for (int j = i + 1; j < NumAreas; j++) { for (int j = i + 1; j < NumAreas; j++) {
if (Areas[i].Intersects(Areas[j])) if (Areas[i].Intersects(Areas[j]))
return oeAreasOverlap; return oeAreasOverlap;
if (Areas[i].x1 > Areas[i].x2 || Areas[i].y1 > Areas[i].y2 || Areas[i].x1 < 0 || Areas[i].y1 < 0)
return oeWrongAlignment;
} }
} }
return oeOk; return oeOk;