From 92711d662d7ffec560f517eb1e4878d1fa1621a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20G=C3=BCnther?= <tom@toms-cafe.de>
Date: Mon, 19 Apr 2010 02:11:59 +0200
Subject: Fixed segmentation fault with 16bit images (closes #258 - thanks to
 domml@vdrportal)

---
 HISTORY  | 4 +++-
 bitmap.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/HISTORY b/HISTORY
index a2ae203..4865ab0 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,10 +1,12 @@
 VDR Plugin 'text2skin' Revision History
 ---------------------------------------
 
-20xx-xx-xx: Version 1.4
+____-__-__: Version 1.3.1
 
 - Fixed some compiler warnings.
 - Makefile adjustments for VDR 1.7.13.
+- Fixed segmentation fault with 16bit images (closes #258 - thanks to
+  domml@vdrportal)
 
 2009-10-06: Version 1.3
 
diff --git a/bitmap.c b/bitmap.c
index 87252ea..2a9037c 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -181,7 +181,7 @@ bool cText2SkinBitmap::LoadNonXpm(const char *Filename, int height, int width, i
 				return false;
 			}
 			*/
-			bmp = new cBitmap(w, h, (*it).depth());
+			bmp = new cBitmap(w, h, std::min((*it).depth(), 8U));
 			//Dprintf("this image has %d colors\n", (*it).totalColors());
 
 			const PixelPacket *pix = (*it).getConstPixels(0, 0, w, h);
-- 
cgit v1.2.3