frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed handling "none" color entries in XPM files

This commit is contained in:
Klaus Schmidinger 2010-05-02 13:59:11 +02:00
parent fd554d9750
commit c19c63530e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1954,6 +1954,7 @@ Thomas G
strings strings
for suggesting to make the 'Allowed' parameter in cMenuEditStrItem() NULL by default, for suggesting to make the 'Allowed' parameter in cMenuEditStrItem() NULL by default,
which results in using tr(FileNameChars) which results in using tr(FileNameChars)
for fixing handling "none" color entries in XPM files
David Woodhouse <dwmw2@infradead.org> David Woodhouse <dwmw2@infradead.org>
for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with for his help in replacing the get/put_unaligned() macros from asm/unaligned.h with

3
HISTORY
View File

@ -6411,7 +6411,7 @@ Video Disk Recorder Revision History
- The new setup option "Folders in timer menu" controls whether the file names in - The new setup option "Folders in timer menu" controls whether the file names in
the timer menu are shown with their full folder path. 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). - Added Macedonian language texts (thanks to Dimitar Petrovski).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov). - 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. driver, so that they can continue using an unmodified driver.
Thanks to Derek Kelly for testing this. Thanks to Derek Kelly for testing this.
- Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk). - Updated the Ukrainian OSD texts (thanks to Yarema Aka Knedlyk).
- Fixed handling "none" color entries in XPM files (thanks to Thomas Günther).

8
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.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" #include "osd.h"
@ -360,10 +360,10 @@ bool cBitmap::SetXpm(const char *const Xpm[], bool IgnoreNone)
} }
s = skipspace(s + 1); s = skipspace(s + 1);
if (strcasecmp(s, "none") == 0) { if (strcasecmp(s, "none") == 0) {
s = "#00000000";
NoneColorIndex = i; NoneColorIndex = i;
if (IgnoreNone) if (!IgnoreNone)
continue; SetColor(i, clrTransparent);
continue;
} }
if (*s != '#') { if (*s != '#') {
esyslog("ERROR: unknown color code in XPM: '%c'", *s); esyslog("ERROR: unknown color code in XPM: '%c'", *s);