git.cweiske.de
/
enigma2.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d85ab0b
)
- make gpixmap flags public
author
Felix Domke
<tmbinc@elitedvb.net>
Mon, 29 Aug 2005 20:06:07 +0000
(20:06 +0000)
committer
Felix Domke
<tmbinc@elitedvb.net>
Mon, 29 Aug 2005 20:06:07 +0000
(20:06 +0000)
lib/gdi/gpixmap.h
patch
|
blob
|
history
diff --git
a/lib/gdi/gpixmap.h
b/lib/gdi/gpixmap.h
index d598fdbd3786a9f78661f5a6917cad88d6ffec66..bd7c61a0f780eae6de221d65bff3c29d4a5d3f66 100644
(file)
--- a/
lib/gdi/gpixmap.h
+++ b/
lib/gdi/gpixmap.h
@@
-105,15
+105,17
@@
private:
friend class gDC;
void fill(const gRegion &clip, const gColor &color);
friend class gDC;
void fill(const gRegion &clip, const gColor &color);
- enum
- {
- blitAlphaTest=1
- };
void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);
void mergePalette(const gPixmap &target);
void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
public:
void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);
void mergePalette(const gPixmap &target);
void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
public:
+ enum
+ {
+ blitAlphaTest=1,
+ blitAlphaBlend=2
+ };
+
gSurface *surface;
eLock contentlock;
gSurface *surface;
eLock contentlock;