git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
language update: pl,lt,sv,de,nl,tr,lv
[enigma2.git]
/
lib
/
gdi
/
gpixmap.cpp
diff --git
a/lib/gdi/gpixmap.cpp
b/lib/gdi/gpixmap.cpp
index d283ef0509f0ac9741a6c400f9ded5870c8efcde..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>
#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++)
{
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();
{
// no real alphatest yet
int width=area.width();
@@
-312,7
+314,7
@@
void gPixmap::blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flag
dstptr+=area.left()+area.top()*surface->stride/4;
for (int y=0; y<area.height(); y++)
{
dstptr+=area.left()+area.top()*surface->stride/4;
for (int y=0; y<area.height(); y++)
{
- if (flag &
(blitAlphaTest|blitAlphaBlend)
)
+ if (flag &
blitAlphaTest
)
{
int width=area.width();
unsigned long *src=(unsigned long*)srcptr;
{
int width=area.width();
unsigned long *src=(unsigned long*)srcptr;