X-Git-Url: https://git.cweiske.de/enigma2.git/blobdiff_plain/22143de3c8c4780166beeb1e0a1575768c76bfe4..9938121132769969c336536523e76abccf8a6818:/lib/gdi/gpixmap.cpp

diff --git a/lib/gdi/gpixmap.cpp b/lib/gdi/gpixmap.cpp
index 3e07bca0..3ebd9a02 100644
--- a/lib/gdi/gpixmap.cpp
+++ b/lib/gdi/gpixmap.cpp
@@ -180,11 +180,9 @@ void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
 	for (unsigned int i=0; i<clip.rects.size(); ++i)
 	{
 		eRect area=eRect(pos, src.size());
-
-		if (!(flag & blitAlphaTest))  // HACK !!
-			area&=clip.rects[i];
-
+		area&=clip.rects[i];
 		area&=eRect(ePoint(0, 0), size());
+
 		if ((area.width()<0) || (area.height()<0))
 			continue;
 
@@ -312,7 +310,7 @@ void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
 						// use duff's device here!
 					while (width--)
 					{
-						if (*src==0x01)
+						if (!(pal[*src]&0x80000000))
 						{
 							src++;
 							dst++;
@@ -381,7 +379,7 @@ void gPixmap::line(const gRegion &clip, ePoint start, ePoint dst, gColor color)
 	if (clip.rects.empty())
 		return;
 		
-	__u32 col;
+	__u32 col = 0;
 	if (surface->bpp == 8)
 	{
 		srf8 = (__u8*)surface->data;
@@ -440,7 +438,7 @@ void gPixmap::line(const gRegion &clip, ePoint start, ePoint dst, gColor color)
 			do
 			{
 				++a;
-				if (a == clip.rects.size())
+				if ((unsigned int)a == clip.rects.size())
 					a = 0;
 				if (a == lasthit)
 				{