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 french and spanish locale for repeat playlist function in mediaplayer
[enigma2.git]
/
lib
/
gdi
/
gpixmap.h
diff --git
a/lib/gdi/gpixmap.h
b/lib/gdi/gpixmap.h
index cc2a4cf41e39a6dd8e12c623d2be85ff44ea1741..e3798bf72fd27ef9d1b940eea88aa422b6067105 100644
(file)
--- a/
lib/gdi/gpixmap.h
+++ b/
lib/gdi/gpixmap.h
@@
-9,20
+9,6
@@
#include <lib/gdi/erect.h>
#include <lib/gdi/fb.h>
#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;
struct gRGB
{
unsigned char b, g, r, a;
@@
-35,12
+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;
}
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;
@@
-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;
struct gPalette
{
int start, colors;
@@
-107,17
+107,18
@@
struct gSurface
class gRegion;
class gRegion;
+SWIG_IGNORE(gPixmap);
class gPixmap: public iObject
{
DECLARE_REF(gPixmap);
public:
class gPixmap: public iObject
{
DECLARE_REF(gPixmap);
public:
+#ifndef SWIG
enum
{
blitAlphaTest=1,
blitAlphaBlend=2
};
enum
{
blitAlphaTest=1,
blitAlphaBlend=2
};
-#ifndef SWIG
gPixmap(gSurface *surface);
gPixmap(eSize, int bpp, int accel = 0);
gPixmap(gSurface *surface);
gPixmap(eSize, int bpp, int accel = 0);
@@
-128,14
+129,12
@@
public:
gPixmap *lock();
void unlock();
gPixmap *lock();
void unlock();
+ inline bool needClut() const { return surface && surface->bpp <= 8; }
#endif
virtual ~gPixmap();
#endif
virtual ~gPixmap();
-
eSize size() const { return eSize(surface->x, surface->y); }
eSize size() const { return eSize(surface->x, surface->y); }
- inline bool needClut() const { return surface && surface->bpp <= 8; }
private:
bool must_delete_surface;
private:
bool must_delete_surface;
-#ifndef SWIG
friend class gDC;
void fill(const gRegion &clip, const gColor &color);
void fill(const gRegion &clip, const gRGB &color);
friend class gDC;
void fill(const gRegion &clip, const gColor &color);
void fill(const gRegion &clip, const gRGB &color);
@@
-144,12
+143,10
@@
private:
void mergePalette(const gPixmap &target);
void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
void mergePalette(const gPixmap &target);
void line(const gRegion &clip, ePoint start, ePoint end, gColor color);
-#
else
+#
ifdef SWIG
gPixmap();
#endif
gPixmap();
#endif
-
};
};
-
-TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
+SWIG_TEMPLATE_TYPEDEF(ePtr<gPixmap>, gPixmapPtr);
#endif
#endif