diff options
Diffstat (limited to 'osd.c')
| -rw-r--r-- | osd.c | 22 |
1 files changed, 18 insertions, 4 deletions
@@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: osd.c 2.6 2009/12/06 11:33:47 kls Exp $ + * $Id: osd.c 2.9 2010/01/22 15:58:39 kls Exp $ */ #include "osd.h" @@ -145,12 +145,14 @@ int cPalette::ClosestColor(tColor Color, int MaxDiff) const int R1 = (Color & 0x00FF0000) >> 16; int G1 = (Color & 0x0000FF00) >> 8; int B1 = (Color & 0x000000FF); - for (int i = 0; i < numColors; i++) { + for (int i = 0; i < numColors && d > 0; i++) { int A2 = (color[i] & 0xFF000000) >> 24; int R2 = (color[i] & 0x00FF0000) >> 16; int G2 = (color[i] & 0x0000FF00) >> 8; int B2 = (color[i] & 0x000000FF); - int diff = (abs(A1 - A2) << 1) + (abs(R1 - R2) << 1) + (abs(G1 - G2) << 1) + (abs(B1 - B2) << 1); + int diff = 0; + if (A1 || A2) // fully transparent colors are considered equal + diff = (abs(A1 - A2) << 1) + (abs(R1 - R2) << 1) + (abs(G1 - G2) << 1) + (abs(B1 - B2) << 1); if (diff < d) { d = diff; n = i; @@ -724,6 +726,18 @@ void cBitmap::ShrinkBpp(int NewBpp) // --- cOsd ------------------------------------------------------------------ +static const char *OsdErrorTexts[] = { + "ok", + "too many areas", + "too many colors", + "bpp not supported", + "areas overlap", + "wrong alignment", + "out of memory", + "wrong area size", + "unknown", + }; + int cOsd::osdLeft = 0; int cOsd::osdTop = 0; int cOsd::osdWidth = 0; @@ -814,7 +828,7 @@ eOsdError cOsd::SetAreas(const tArea *Areas, int NumAreas) } } else - esyslog("ERROR: cOsd::SetAreas returned %d", Result); + esyslog("ERROR: cOsd::SetAreas returned %d (%s)", Result, Result < oeUnknown ? OsdErrorTexts[Result] : OsdErrorTexts[oeUnknown]); return Result; } |