uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Fixing compiler warnings

Browse source
This commit is contained in:
Joel Bodenmann 2015-11-02 12:24:13 +01:00
parent d3cea5c390
commit 58f6e0452e
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gdisp/gdisp.c
View file

@ -3248,7 +3248,12 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
} }
void gdispGDrawStringBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, font_t font, color_t color, justify_t justify) { void gdispGDrawStringBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, font_t font, color_t color, justify_t justify) {
#if GDISP_NEED_TEXT_WORDWRAP
wrapParameters_t wrapParameters;
#endif
MUTEX_ENTER(g); MUTEX_ENTER(g);
g->t.font = font; g->t.font = font;
g->t.clipx0 = x; g->t.clipx0 = x;
g->t.clipy0 = y; g->t.clipy0 = y;
@ -3272,7 +3277,6 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/* Render */ /* Render */
#if GDISP_NEED_TEXT_WORDWRAP #if GDISP_NEED_TEXT_WORDWRAP
wrapParameters_t wrapParameters;
wrapParameters.x = x; wrapParameters.x = x;
wrapParameters.y = y; wrapParameters.y = y;
wrapParameters.font = font; wrapParameters.font = font;
@ -3289,7 +3293,12 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
} }
void gdispGFillStringBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, font_t font, color_t color, color_t bgcolor, justify_t justify) { void gdispGFillStringBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, const char* str, font_t font, color_t color, color_t bgcolor, justify_t justify) {
#if GDISP_NEED_TEXT_WORDWRAP
wrapParameters_t wrapParameters;
#endif
MUTEX_ENTER(g); MUTEX_ENTER(g);
g->p.cx = cx; g->p.cx = cx;
g->p.cy = cy; g->p.cy = cy;
g->t.font = font; g->t.font = font;
@ -3321,7 +3330,6 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
/* Render */ /* Render */
#if GDISP_NEED_TEXT_WORDWRAP #if GDISP_NEED_TEXT_WORDWRAP
wrapParameters_t wrapParameters;
wrapParameters.x = x; wrapParameters.x = x;
wrapParameters.y = y; wrapParameters.y = y;
wrapParameters.font = font; wrapParameters.font = font;