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 cBitmap::DrawPixel(), which messed with other bitmaps' palettes in case the pixel coordinates were outside this bitmap

Browse Source
This commit is contained in:
Klaus Schmidinger 2004-06-05 11:24:37 +02:00
parent 916b740d99
commit 2a5a55cee7
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS
View File

@ -713,6 +713,8 @@ Sascha Volkenandt <sascha@akv-soft.de>
for suggesting to map the color name "None" to #00000000 when processing XPM data for suggesting to map the color name "None" to #00000000 when processing XPM data
for suggesting to also reset the palette in cBitmap::DrawBitmap() if the entire for suggesting to also reset the palette in cBitmap::DrawBitmap() if the entire
bitmap area is covered bitmap area is covered
for reporting a bug in cBitmap::DrawPixel(), which messed with other bitmaps'
palettes in case the pixel coordinates were outside this bitmap
Malcolm Caldwell <malcolm.caldwell@ntu.edu.au> Malcolm Caldwell <malcolm.caldwell@ntu.edu.au>
for modifying LOF handling to allow for C-band reception for modifying LOF handling to allow for C-band reception

5
HISTORY
View File

@ -2870,6 +2870,9 @@ Video Disk Recorder Revision History
available by compiling VDR with DEBUG_OSD. Some things may not yet work as they available by compiling VDR with DEBUG_OSD. Some things may not yet work as they
should, but it's a starting point. should, but it's a starting point.
2004-05-31: Version 1.3.10 2004-06-05: Version 1.3.10
- Fixed some default parameters in 'skincurses'. - Fixed some default parameters in 'skincurses'.
- Fixed cBitmap::DrawPixel(), which messed with other bitmaps' palettes in case
the pixel coordinates were outside this bitmap (thanks to Sascha Volkenandt for
reporting this one).

6
config.h
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: config.h 1.196 2004/05/28 13:16:03 kls Exp $ * $Id: config.h 1.197 2004/06/05 10:06:50 kls Exp $
*/ */
#ifndef __CONFIG_H #ifndef __CONFIG_H
@ -20,8 +20,8 @@
#include "i18n.h" #include "i18n.h"
#include "tools.h" #include "tools.h"
#define VDRVERSION "1.3.9" #define VDRVERSION "1.3.10"
#define VDRVERSNUM 10309 // Version * 10000 + Major * 100 + Minor #define VDRVERSNUM 10310 // Version * 10000 + Major * 100 + Minor
#define MAXPRIORITY 99 #define MAXPRIORITY 99
#define MAXLIFETIME 99 #define MAXLIFETIME 99

5
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.48 2004/05/28 15:33:22 kls Exp $ * $Id: osd.c 1.49 2004/06/05 11:15:43 kls Exp $
*/ */
#include "osd.h" #include "osd.h"
@ -324,7 +324,8 @@ void cBitmap::DrawPixel(int x, int y, tColor Color)
{ {
x -= x0; x -= x0;
y -= y0; y -= y0;
SetIndex(x, y, Index(Color)); if (0 <= x && x < width && 0 <= y && y < height)
SetIndex(x, y, Index(Color));
} }
void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg) void cBitmap::DrawBitmap(int x, int y, const cBitmap &Bitmap, tColor ColorFg, tColor ColorBg)