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 7158e26989b6e72c1eba4cb7911f7de4468d9695..d717ec6ff5d39c01d1c22b14f0a24c2673d942a5 100644 (file)
--- a/lib/gdi/gpixmap.h
+++ b/lib/gdi/gpixmap.h
@@ -8,20 +8,6 @@
 #include <lib/base/elock.h>
 #include <lib/gdi/erect.h>
 #include <lib/gdi/fb.h>
-#include <lib/gdi/region.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
 {
@@ -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;
@@ -103,6 +103,9 @@ struct gSurface
        gSurface(eSize size, int bpp, int accel);
        ~gSurface();
 };
+#endif
+
+class gRegion;
 
 class gPixmap: public iObject
 {
@@ -131,6 +134,7 @@ public:
        eSize size() const { return eSize(surface->x, surface->y); }
        inline bool needClut() const { return surface && surface->bpp <= 8; }
 private:
+       bool must_delete_surface;
 #ifndef SWIG
        friend class gDC;
        void fill(const gRegion &clip, const gColor &color);