summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2004-06-05 16:52:51 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2004-06-05 16:52:51 +0200
commit2dc9309d2d39bd52d1f0eefa5a64ab36f3e77bf8 (patch)
tree44dd87441d46372fed3ebbb15a4d8b27096df215
parent51b02cade3f7f01207901c49fcbe2636883537ae (diff)
downloadvdr-2dc9309d2d39bd52d1f0eefa5a64ab36f3e77bf8.tar.gz
vdr-2dc9309d2d39bd52d1f0eefa5a64ab36f3e77bf8.tar.bz2
Fixed ignoring unused "none" color entries in XPM files (there was an unnecessary log entry)
-rw-r--r--osd.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/osd.c b/osd.c
index 7159a83c..ac950ff6 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.51 2004/06/05 13:20:19 kls Exp $
+ * $Id: osd.c 1.52 2004/06/05 16:52:51 kls Exp $
*/
#include "osd.h"
@@ -397,7 +397,7 @@ void cBitmap::DrawText(int x, int y, const char *s, tColor ColorFg, tColor Color
x -= x0;
y -= y0;
tIndex fg = Index(ColorFg);
- tIndex bg = Index(ColorBg);
+ tIndex bg = (ColorBg != clrTransparent) ? Index(ColorBg) : 0;
while (s && *s) {
const cFont::tCharData *CharData = Font->CharData(*s++);
if (limit && int(x + CharData->width) > limit)