diff options
| author | Klaus Schmidinger <vdr@tvdr.de> | 2012-12-15 11:57:16 +0100 |
|---|---|---|
| committer | Klaus Schmidinger <vdr@tvdr.de> | 2012-12-15 11:57:16 +0100 |
| commit | 40bfe40368ad40916b23d4bd8b8c3293d1b03cc0 (patch) | |
| tree | 73e15bd48ec73c7a2bbf954479f5781a970b0b3e /osd.c | |
| parent | e33824217bd2a6ed0bb756479bfa3204e42d4c43 (diff) | |
| download | vdr-40bfe40368ad40916b23d4bd8b8c3293d1b03cc0.tar.gz vdr-40bfe40368ad40916b23d4bd8b8c3293d1b03cc0.tar.bz2 | |
Fixed cOsd::GetBitmap() to always return NULL if a non-exising area is requested
Diffstat (limited to 'osd.c')
| -rw-r--r-- | osd.c | 6 |
1 files changed, 2 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.32 2012/06/09 14:37:24 kls Exp $ + * $Id: osd.c 2.33 2012/12/15 11:16:41 kls Exp $ */ #include "osd.h" @@ -1683,9 +1683,7 @@ void cOsd::SetAntiAliasGranularity(uint FixedColors, uint BlendColors) cBitmap *cOsd::GetBitmap(int Area) { - if (isTrueColor) - Area = 0; // returns the dummy bitmap - return Area < numBitmaps ? bitmaps[Area] : NULL; + return Area < numBitmaps ? (isTrueColor ? bitmaps[0] : bitmaps[Area]) : NULL; } cPixmap *cOsd::CreatePixmap(int Layer, const cRect &ViewPort, const cRect &DrawPort) |