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

8
osd.c
View File

@@ -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);