From fe9316caba3d62ccfffbb2e8e086e5995b421c98 Mon Sep 17 00:00:00 2001
From: Anssi Hannula <anssi.hannula@iki.fi>
Date: Fri, 27 Aug 2010 10:58:26 +0300
Subject: Fix build with ImageMagick >= 6.6.2 (closes #409).

---
 HISTORY  | 4 ++++
 bitmap.c | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/HISTORY b/HISTORY
index 1afc7c7..a8e9d57 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,10 @@
 VDR Plugin 'text2skin' Revision History
 ---------------------------------------
 
+201x-xx-xx: Version x.x.x
+
+- Fix build with ImageMagick >= 6.6.2 (thanks to Anssi Hannula / closes #409)
+
 2010-06-21: Version 1.3.1
 
 - Fixed some compiler warnings.
diff --git a/bitmap.c b/bitmap.c
index 9213555..779c6f6 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -187,7 +187,7 @@ bool cText2SkinBitmap::LoadNonXpm(const char *Filename, int height, int width, i
 				return false;
 			}
 			*/
-			bmp = new cBitmap(w, h, std::min((*it).depth(), 8U));
+			bmp = new cBitmap(w, h, std::min(size_t((*it).depth()), size_t(8)));
 			//Dprintf("this image has %d colors\n", (*it).totalColors());
 
 			const PixelPacket *pix = (*it).getConstPixels(0, 0, w, h);
-- 
cgit v1.2.3