summaryrefslogtreecommitdiff
path: root/render/render.h
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2003-06-21 02:00:42 +0000
committerDana Jansens <danakj@orodu.net>2003-06-21 02:00:42 +0000
commit092616de9a809a1c9a646901521ffcc1f337e913 (patch)
treeda4c62231354e15d6a784cf1682c9b628563e872 /render/render.h
parentbd59576748db274c1a5e6ffece5df51d7d700b23 (diff)
rename pixel32/16 to RrPixel32/16
Diffstat (limited to 'render/render.h')
-rw-r--r--render/render.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/render/render.h b/render/render.h
index fb48bd5f..30bf4846 100644
--- a/render/render.h
+++ b/render/render.h
@@ -18,8 +18,8 @@ typedef struct _RrPixmapMask RrPixmapMask;
typedef struct _RrInstance RrInstance;
typedef struct _RrColor RrColor;
-typedef guint32 pixel32; /* XXX prefix */
-typedef guint16 pixel16;
+typedef guint32 RrPixel32;
+typedef guint16 RrPixel16;
typedef enum {
RR_RELIEF_FLAT,
@@ -72,7 +72,7 @@ struct _RrSurface {
RrAppearance *parent;
gint parentx;
gint parenty;
- pixel32 *pixel_data;
+ RrPixel32 *RrPixel_data;
};
struct _RrTextureText {
@@ -101,11 +101,11 @@ struct _RrTextureMask {
struct _RrTextureRGBA {
gint width;
gint height;
- pixel32 *data;
+ RrPixel32 *data;
/* cached scaled so we don't have to scale often */
gint cwidth;
gint cheight;
- pixel32 *cache;
+ RrPixel32 *cache;
};
union _RrTextureData {
@@ -166,6 +166,6 @@ void RrMinsize (RrAppearance *l, gint *w, gint *h);
gboolean RrPixmapToRGBA(const RrInstance *inst,
Pixmap pmap, Pixmap mask,
- gint *w, gint *h, pixel32 **data);
+ gint *w, gint *h, RrPixel32 **data);
#endif /*__render_h*/