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

When processing XPM data, the color name "None" is no mapped to #00000000

Browse Source
This commit is contained in:
Klaus Schmidinger 2004-05-22 13:53:32 +02:00
parent 5aacc51c14
commit 8eff25b8de
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -698,6 +698,7 @@ Sascha Volkenandt <sascha@akv-soft.de>
for his support in debugging the the "Unknown picture type error" for his support in debugging the the "Unknown picture type error"
for reporting a crash when switching the skin and having selected a non-default for reporting a crash when switching the skin and having selected a non-default
theme that is not available for the newly selected skin theme that is not available for the newly selected skin
for suggesting to map the color name "None" to #00000000 when processing XPM data
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

2
HISTORY
View File

@ -2819,3 +2819,5 @@ Video Disk Recorder Revision History
cEvent::GetDateString() should note that this function now returns a longer cEvent::GetDateString() should note that this function now returns a longer
string, including the day of week. The new function const char *WeekDayName(time_t t) string, including the day of week. The new function const char *WeekDayName(time_t t)
can be called with a time_t value to get the day of week for that time. can be called with a time_t value to get the day of week for that time.
- When processing XPM data, the color name "None" is no mapped to #00000000, which
is "fully transparent" (suggested by Sascha Volkenandt).

4
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.46 2004/05/16 09:25:06 kls Exp $ * $Id: osd.c 1.47 2004/05/22 13:47:39 kls Exp $
*/ */
#include "osd.h" #include "osd.h"
@ -264,6 +264,8 @@ bool cBitmap::SetXpm(char *Xpm[])
return false; return false;
} }
s = skipspace(s + 1); s = skipspace(s + 1);
if (strcasecmp(s, "none") == 0)
s = "#00000000";
if (*s != '#') { if (*s != '#') {
esyslog("ERROR: unknown color code in XPM: '%c'", *s); esyslog("ERROR: unknown color code in XPM: '%c'", *s);
return false; return false;