aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel@unormal.org>2013-09-29 18:23:22 +0200
committerJoel Bodenmann <joel@unormal.org>2013-09-29 18:23:22 +0200
commit0f7777395b30ea8cec02b3230ed250eee7d34f16 (patch)
treeaf64c3f96fb22bb7bfd2ee41aa58a859d368bd4d
parent6499da5be310f8f3ef8f2d11dfcfb662499c8c17 (diff)
downloaduGFX-0f7777395b30ea8cec02b3230ed250eee7d34f16.tar.gz
uGFX-0f7777395b30ea8cec02b3230ed250eee7d34f16.tar.bz2
uGFX-0f7777395b30ea8cec02b3230ed250eee7d34f16.zip
GDISP X driver fixes
-rw-r--r--drivers/multiple/X/gdisp_lld.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/multiple/X/gdisp_lld.c b/drivers/multiple/X/gdisp_lld.c
index 9c6a7123..0e5e03b4 100644
--- a/drivers/multiple/X/gdisp_lld.c
+++ b/drivers/multiple/X/gdisp_lld.c
@@ -131,7 +131,6 @@ static int FatalXIOError(Display *d) {
}
LLDSPEC bool_t gdisp_lld_init(GDISPDriver *g) {
-{
XSizeHints *pSH;
XSetWindowAttributes xa;
XTextProperty WindowTitle;
@@ -212,7 +211,7 @@ LLDSPEC bool_t gdisp_lld_init(GDISPDriver *g) {
gfxThreadClose(hth);
/* Initialise the GDISP structure to match */
- g->g.Orientation = g->g_ROTATE_0;
+ g->g.Orientation = GDISP_ROTATE_0;
g->g.Powermode = powerOn;
g->g.Backlight = 100;
g->g.Contrast = 50;
@@ -269,10 +268,10 @@ LLDSPEC void gdisp_lld_draw_pixel(GDISPDriver *g)
XImage *img;
img = XGetImage (dis, pix, g->p.x, g->p.y, 1, 1, AllPlanes, XYPixmap);
- color->pixel = XGetPixel (img, 0, 0);
+ color.pixel = XGetPixel (img, 0, 0);
XFree(img);
XQueryColor(dis, cmap, &color);
- return RGB2COLOR(c.red>>8, c.green>>8, c.blue>>8);
+ return RGB2COLOR(color.red>>8, color.green>>8, color.blue>>8);
}
#endif