summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--HISTORY1
-rw-r--r--bitmap.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/HISTORY b/HISTORY
index 0eb9483..2dc98d4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -73,6 +73,7 @@ ____-__-__: Version 1.3
- Updated FSF address in the license information
- Updated gettext language files
- Removed backward compatibility to VDR < 1.6.0 (closes #137)
+- Fixed compile error if ImageMagick has double as Quantum type (closes #140)
2009-06-01: Version 1.2
diff --git a/bitmap.c b/bitmap.c
index 60f95d7..3fd0115 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -241,7 +241,7 @@ bool cText2SkinBitmap::LoadMagick(const char *Filename, int height, int width, i
const PixelPacket *pix = (*it).getConstPixels(0, 0, w, h);
for (int iy = 0; iy < h; ++iy) {
for (int ix = 0; ix < w; ++ix) {
- tColor col = (~(pix->opacity * 255 / MaxRGB) << 24) | ((pix->red * 255 / MaxRGB) << 16) | ((pix->green * 255 / MaxRGB) << 8) | (pix->blue * 255 / MaxRGB);
+ tColor col = (~int(pix->opacity * 255 / MaxRGB) << 24) | (int(pix->red * 255 / MaxRGB) << 16) | (int(pix->green * 255 / MaxRGB) << 8) | int(pix->blue * 255 / MaxRGB);
bmp->DrawPixel(ix, iy, col);
++pix;
}