diff options
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | HISTORY | 3 | ||||
| -rw-r--r-- | osd.c | 8 |
3 files changed, 7 insertions, 5 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index c004c078..7dafbca4 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1954,6 +1954,7 @@ Thomas Günther <tom1@toms-cafe.de> strings for suggesting to make the 'Allowed' parameter in cMenuEditStrItem() NULL by default, which results in using tr(FileNameChars) + for fixing handling "none" color entries in XPM files David Woodhouse <dwmw2@infradead.org> for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with @@ -6411,7 +6411,7 @@ Video Disk Recorder Revision History - The new setup option "Folders in timer menu" controls whether the file names in the timer menu are shown with their full folder path. -2010-04-25: Version 1.7.15 +2010-05-02: Version 1.7.15 - Added Macedonian language texts (thanks to Dimitar Petrovski). - Updated the Estonian OSD texts (thanks to Arthur Konovalov). @@ -6447,3 +6447,4 @@ Video Disk Recorder Revision History driver, so that they can continue using an unmodified driver. Thanks to Derek Kelly for testing this. - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk). +- Fixed handling "none" color entries in XPM files (thanks to Thomas Günther). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.c 2.9 2010/01/22 15:58:39 kls Exp $ + * $Id: osd.c 2.10 2010/05/02 13:56:53 kls Exp $ */ #include "osd.h" @@ -360,10 +360,10 @@ bool cBitmap::SetXpm(const char *const Xpm[], bool IgnoreNone) } s = skipspace(s + 1); if (strcasecmp(s, "none") == 0) { - s = "#00000000"; NoneColorIndex = i; - if (IgnoreNone) - continue; + if (!IgnoreNone) + SetColor(i, clrTransparent); + continue; } if (*s != '#') { esyslog("ERROR: unknown color code in XPM: '%c'", *s); |