From 8eff25b8de89fb536b7cd78d25af8907e615e605 Mon Sep 17 00:00:00 2001 From: Klaus Schmidinger Date: Sat, 22 May 2004 13:53:32 +0200 Subject: [PATCH] When processing XPM data, the color name "None" is no mapped to #00000000 --- CONTRIBUTORS | 1 + HISTORY | 2 ++ osd.c | 4 +++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c3ef4cc6..3ae19e55 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -698,6 +698,7 @@ Sascha Volkenandt 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 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 for modifying LOF handling to allow for C-band reception diff --git a/HISTORY b/HISTORY index e9cf9c25..1b7a027c 100644 --- a/HISTORY +++ b/HISTORY @@ -2819,3 +2819,5 @@ Video Disk Recorder Revision History 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) 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). diff --git a/osd.c b/osd.c index 94668623..077cd9c1 100644 --- a/osd.c +++ b/osd.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * 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" @@ -264,6 +264,8 @@ bool cBitmap::SetXpm(char *Xpm[]) return false; } s = skipspace(s + 1); + if (strcasecmp(s, "none") == 0) + s = "#00000000"; if (*s != '#') { esyslog("ERROR: unknown color code in XPM: '%c'", *s); return false;