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 an endless loop in the DrawEllipse() functions for very small ellipses

Browse Source
This commit is contained in:
Klaus Schmidinger 2013-05-18 12:39:59 +02:00
parent f6adb32202
commit cc6c05fcf2
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -3147,6 +3147,7 @@ Zoran Turalija <zoran.turalija@gmail.com>
Stefan Braun <louis.braun@gmx.de> Stefan Braun <louis.braun@gmx.de>
for reporting an endless loop in cTextWrapper::Set() in case the given Width is smaller for reporting an endless loop in cTextWrapper::Set() in case the given Width is smaller
than one character than one character
for reporting an endless loop in the DrawEllipse() functions for very small ellipses
Jochen Dolze <vdr@dolze.de> Jochen Dolze <vdr@dolze.de>
for changing cThread::SetIOPriority() from "best effort class" to "idle class" in order for changing cThread::SetIOPriority() from "best effort class" to "idle class" in order

4
HISTORY
View File

@ -7809,7 +7809,7 @@ Video Disk Recorder Revision History
- Fixed an error message when parsing SCR values in diseqc.conf. - Fixed an error message when parsing SCR values in diseqc.conf.
- Fixed an unexpected RCS version tag in the newplugin script. - Fixed an unexpected RCS version tag in the newplugin script.
2013-05-02: Version 2.1.1 2013-05-18: Version 2.1.1
- Fixed initializing cDevice::keepTracks. - Fixed initializing cDevice::keepTracks.
- Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than - Fixed an endless loop in cTextWrapper::Set() in case the given Width is smaller than
@ -7836,3 +7836,5 @@ Video Disk Recorder Revision History
one single sequence (reported by Halim Sahin). one single sequence (reported by Halim Sahin).
- Fixed an error message when parsing SCR values in diseqc.conf. - Fixed an error message when parsing SCR values in diseqc.conf.
- Fixed an unexpected RCS version tag in the newplugin script. - Fixed an unexpected RCS version tag in the newplugin script.
- Fixed an endless loop in the DrawEllipse() functions for very small ellipses (reported
by Stefan Braun).

10
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 2.38 2013/02/14 15:50:19 kls Exp $ * $Id: osd.c 3.1 2013/05/18 12:33:16 kls Exp $
*/ */
#include "osd.h" #include "osd.h"
@ -639,8 +639,8 @@ void cBitmap::DrawEllipse(int x1, int y1, int x2, int y2, tColor Color, int Quad
case 8: cy = y1; rx /= 2; break; case 8: cy = y1; rx /= 2; break;
default: ; default: ;
} }
int TwoASquare = 2 * rx * rx; int TwoASquare = max(1, 2 * rx * rx);
int TwoBSquare = 2 * ry * ry; int TwoBSquare = max(1, 2 * ry * ry);
int x = rx; int x = rx;
int y = 0; int y = 0;
int XChange = ry * ry * (1 - 2 * rx); int XChange = ry * ry * (1 - 2 * rx);
@ -1380,8 +1380,8 @@ void cPixmapMemory::DrawEllipse(const cRect &Rect, tColor Color, int Quadrants)
case 8: cy = y1; rx /= 2; break; case 8: cy = y1; rx /= 2; break;
default: ; default: ;
} }
int TwoASquare = 2 * rx * rx; int TwoASquare = max(1, 2 * rx * rx);
int TwoBSquare = 2 * ry * ry; int TwoBSquare = max(1, 2 * ry * ry);
int x = rx; int x = rx;
int y = 0; int y = 0;
int XChange = ry * ry * (1 - 2 * rx); int XChange = ry * ry * (1 - 2 * rx);