Merge branch 'master' of fraxinas@git.opendreambox.org:/git/enigma2

[enigma2.git] / lib / gdi / gpixmap.cpp

diff --git a/lib/gdi/gpixmap.cpp b/lib/gdi/gpixmap.cpp
index e2960ad71f2257dc70f4ae0af0cf637969e728ce..e01e5e434cd1ddcd14653f8d750479e2d4a36d37 100644 (file)
--- a/lib/gdi/gpixmap.cpp
+++ b/lib/gdi/gpixmap.cpp
@@ -1,3 +1,5 @@
+#include <cstdlib>
+#include <cstring>
 #include <lib/gdi/gpixmap.h>
 #include <lib/gdi/region.h>
 #include <lib/gdi/accel.h>
@@ -282,7 +284,7 @@ void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
                        dstptr+=area.left()*surface->bypp+area.top()*surface->stride;
                        for (int y=0; y<area.height(); y++)
                        {
-                               if (flag & blitAlphaTest)
+                               if (flag & (blitAlphaTest|blitAlphaBlend))
                                {
                      // no real alphatest yet
                                        int width=area.width();