aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-12-10 22:32:39 +0000
committerAndreas Monzner <andreas.monzner@multimedia-labs.de>2006-12-10 22:32:39 +0000
commit54c5d207bf165cda83eec602c57ed36d1f278454 (patch)
tree00c7563f04cfe683bc36e39f076340acfdce69ce /lib
parent096614438df798ea2a2d2355e546f5e17174dd14 (diff)
downloadenigma2-54c5d207bf165cda83eec602c57ed36d1f278454.tar.gz
enigma2-54c5d207bf165cda83eec602c57ed36d1f278454.zip
export gRGB to python again
Diffstat (limited to 'lib')
-rw-r--r--lib/gdi/gpixmap.h32
1 files changed, 16 insertions, 16 deletions
diff --git a/lib/gdi/gpixmap.h b/lib/gdi/gpixmap.h
index cc2a4cf4..d717ec6f 100644
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -9,20 +9,6 @@
#include <lib/gdi/erect.h>
#include <lib/gdi/fb.h>
-#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 gRGB
{
unsigned char b, g, r, a;
@@ -35,12 +21,12 @@ struct gRGB
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;
@@ -72,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;