git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add possibility to select multimode instead of pal/ntsc for TVs with support
[enigma2.git]
/
lib
/
gdi
/
gpixmap.h
diff --git
a/lib/gdi/gpixmap.h
b/lib/gdi/gpixmap.h
index bd53716441d2f6d49b60510a6b61ed6d5458ad0b..d717ec6ff5d39c01d1c22b14f0a24c2673d942a5 100644
(file)
--- a/
lib/gdi/gpixmap.h
+++ b/
lib/gdi/gpixmap.h
@@
-9,19
+9,6
@@
#include <lib/gdi/erect.h>
#include <lib/gdi/fb.h>
#include <lib/gdi/erect.h>
#include <lib/gdi/fb.h>
-struct gColor
-{
- int color;
- gColor(int color): color(color)
- {
- }
- gColor(): color(0)
- {
- }
- operator int() const { return color; }
- bool operator==(const gColor &o) const { return o.color==color; }
-};
-
struct gRGB
{
unsigned char b, g, r, a;
struct gRGB
{
unsigned char b, g, r, a;
@@
-34,6
+21,12
@@
struct gRGB
gRGB(): b(0), g(0), r(0), a(0)
{
}
gRGB(): b(0), g(0), r(0), a(0)
{
}
+
+ unsigned long argb() const
+ {
+ return (a<<24)|(r<<16)|(g<<8)|b;
+ }
+
void operator=(unsigned long val)
{
b = val&0xFF;
void operator=(unsigned long val)
{
b = val&0xFF;
@@
-65,6
+58,20
@@
struct gRGB
}
};
}
};
+#ifndef SWIG
+struct gColor
+{
+ int color;
+ gColor(int color): color(color)
+ {
+ }
+ gColor(): color(0)
+ {
+ }
+ operator int() const { return color; }
+ bool operator==(const gColor &o) const { return o.color==color; }
+};
+
struct gPalette
{
int start, colors;
struct gPalette
{
int start, colors;
@@
-96,6
+103,9
@@
struct gSurface
gSurface(eSize size, int bpp, int accel);
~gSurface();
};
gSurface(eSize size, int bpp, int accel);
~gSurface();
};
+#endif
+
+class gRegion;
class gPixmap: public iObject
{
class gPixmap: public iObject
{
@@
-122,11
+132,13
@@
public:
virtual ~gPixmap();
eSize size() const { return eSize(surface->x, surface->y); }
virtual ~gPixmap();
eSize size() const { return eSize(surface->x, surface->y); }
-
+ inline bool needClut() const { return surface && surface->bpp <= 8; }
private:
private:
+ bool must_delete_surface;
#ifndef SWIG
friend class gDC;
void fill(const gRegion &clip, const gColor &color);
#ifndef SWIG
friend class gDC;
void fill(const gRegion &clip, const gColor &color);
+ void fill(const gRegion &clip, const gRGB &color);
void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);
void blit(const gPixmap &src, ePoint pos, const gRegion &clip, int flags=0);