summaryrefslogtreecommitdiff
path: root/bitmap.c
diff options
context:
space:
mode:
authorAndreas Mair <amair.sob@googlemail.com>2009-04-24 14:32:32 +0200
committerAndreas Mair <amair.sob@googlemail.com>2009-04-24 14:32:32 +0200
commit95977e11c0a5c1170351f2fafe400519d7b1086b (patch)
tree92259a6c6b8a7dc50ed9a0c3a2a172b204a4f54c /bitmap.c
parent7b34d920b0043281d7877d1e0ece8642d27f212d (diff)
downloadvdr-plugin-skinenigmang-0.1.0.tar.gz
vdr-plugin-skinenigmang-0.1.0.tar.bz2
2009-04-25: Version 0.1.0v0.1.0
- Fixed: Calculating width of events' start times in channel info OSD (Reported by tomglx @vdr-poprtal.de). - Changed: pause scrolling when text has scrolled all to the left in scroll behaviour "to the left" (Reported by Andreas Brugger). - Reworked: (simplified) font loading/caching. - Updated Italian translation (Provided by Diego Pierotto). - Removed: ENABLE_COPYFONT define. - Changed: Reduced number of font recreations (Reported by balta @vdr-portal.de). - Added: more CA systems to text mappings in channel info OSD (Submitted by free-x @vdr-portal.de). - Added: symbol in channel info OSD if current channel has subtitles. - Changed: background colors for the DarkBlue theme (Submitted by zulu @vdr-portal.de). - Added: New option "Show CA system as text". - Changed: Reduced number of locks while drawing to OSD which increases display speed especially in menu OSD. - Added: show signal strength and signal-to-noise ratio in channel info OSD (can be disabled by setting SKINENIGMA_DISABLE_SIGNALINFO to 1). - Fixed: compiler error with certain gcc versions (Reported by C-3PO @ vdr-portal.de). - Changed: smooth scrolling text (based on skinelchi by Christoph Haubrich <christoph.haubrich (AT) web.de>). - Removed: SKINENIGMA_DISABLE_ANIMATED_TEXT define. - Changed: Replace "/" by "~" in channel logo names. - Added: new setting "Show scrollbar in menu". - Added: Override VDR's SetTabs() to adopt column widths in menu OSD to selected font size. - Added: Support subtitle tracks in tracks OSD: logo will only be shown if icons/subtitle/subtitle.xpm exists. - Fixed: missing logo in tracks OSD while using single area. - Minor bugfixes and enhancements. - Requires at least VDR v1.6.0.
Diffstat (limited to 'bitmap.c')
-rw-r--r--bitmap.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/bitmap.c b/bitmap.c
index 8b7214c..536c700 100644
--- a/bitmap.c
+++ b/bitmap.c
@@ -48,6 +48,9 @@ bool cOSDImageBitmap::DrawMagick(const char *Filename, int x, int y, int width,
case 2:
image.zoom(Geometry(width, height));
break;
+ default:
+ esyslog("ERROR: unknown resize mode %d", EnigmaConfig.resizeImages);
+ break;
}
}
geo = image.size();
@@ -68,10 +71,10 @@ bool cOSDImageBitmap::DrawMagick(const char *Filename, int x, int y, int width,
const PixelPacket *pix = image.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(x + ix, y + iy, col);
++pix;
}