diff options
| author | inmarket <andrewh@inmarket.com.au> | 2013-11-10 21:33:28 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2013-11-10 21:33:28 +1000 |
| commit | 5cc1c5d67b339dc3cc623a6f3d10b9137d0929c8 (patch) | |
| tree | 2217a09b48715624402d7a555b77e493120743c0 /src/gdisp | |
| parent | 1f99d5c9fac79e3e9aa4ebff97b296b6dcb9c9a7 (diff) | |
| download | uGFX-5cc1c5d67b339dc3cc623a6f3d10b9137d0929c8.tar.gz uGFX-5cc1c5d67b339dc3cc623a6f3d10b9137d0929c8.tar.bz2 uGFX-5cc1c5d67b339dc3cc623a6f3d10b9137d0929c8.zip | |
Fix some compiler warnings.
Diffstat (limited to 'src/gdisp')
| -rw-r--r-- | src/gdisp/gdisp.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 6964bfff..2af30f15 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -589,7 +589,7 @@ void _gdispInit(void) { #if defined(GDISP_DEFAULT_ORIENTATION) && GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL g->p.x = GDISP_CONTROL_ORIENTATION; - g->p.ptr = GDISP_DEFAULT_ORIENTATION; + g->p.ptr = (void *)GDISP_DEFAULT_ORIENTATION; #if GDISP_HARDWARE_CONTROL == HARDWARE_AUTODETECT if (g->vmt->control) #endif @@ -2379,10 +2379,12 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c if (what == GDISP_CONTROL_ORIENTATION) { switch ((orientation_t) value) { case GDISP_ROTATE_LANDSCAPE: - g->p.ptr = g->g.Width >= g->g.Height ? GDISP_ROTATE_0 : GDISP_ROTATE_90; + g->p.ptr = g->g.Width >= g->g.Height ? (void *)GDISP_ROTATE_0 : (void *)GDISP_ROTATE_90; break; case GDISP_ROTATE_PORTRAIT: - g->p.ptr = g->g.Width >= g->g.Height ? GDISP_ROTATE_90 : GDISP_ROTATE_0; + g->p.ptr = g->g.Width >= g->g.Height ? (void *)GDISP_ROTATE_90 : (void *)GDISP_ROTATE_0; + break; + default: break; } } |