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

Add protection for a font not being supplied.

Browse source
This commit is contained in:
inmarket 2016-10-01 18:54:18 +10:00
parent e3a0cff000
commit b3ba618c2a
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/gdisp/gdisp.c
View file

@ -3202,6 +3202,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
#endif #endif
void gdispGDrawChar(GDisplay *g, coord_t x, coord_t y, uint16_t c, font_t font, color_t color) { void gdispGDrawChar(GDisplay *g, coord_t x, coord_t y, uint16_t c, font_t font, color_t color) {
if (!font)
return;
MUTEX_ENTER(g); MUTEX_ENTER(g);
g->t.font = font; g->t.font = font;
g->t.clipx0 = x; g->t.clipx0 = x;
@ -3215,6 +3217,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
} }
void gdispGFillChar(GDisplay *g, coord_t x, coord_t y, uint16_t c, font_t font, color_t color, color_t bgcolor) { void gdispGFillChar(GDisplay *g, coord_t x, coord_t y, uint16_t c, font_t font, color_t color, color_t bgcolor) {
if (!font)
return;
MUTEX_ENTER(g); MUTEX_ENTER(g);
g->p.cx = mf_character_width(font, c) + font->baseline_x; g->p.cx = mf_character_width(font, c) + font->baseline_x;
g->p.cy = font->height; g->p.cy = font->height;
@ -3235,6 +3239,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
} }
void gdispGDrawString(GDisplay *g, coord_t x, coord_t y, const char *str, font_t font, color_t color) { void gdispGDrawString(GDisplay *g, coord_t x, coord_t y, const char *str, font_t font, color_t color) {
if (!font)
return;
MUTEX_ENTER(g); MUTEX_ENTER(g);
g->t.font = font; g->t.font = font;
g->t.clipx0 = x; g->t.clipx0 = x;
@ -3249,6 +3255,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
} }
void gdispGFillString(GDisplay *g, coord_t x, coord_t y, const char *str, font_t font, color_t color, color_t bgcolor) { void gdispGFillString(GDisplay *g, coord_t x, coord_t y, const char *str, font_t font, color_t color, color_t bgcolor) {
if (!font)
return;
MUTEX_ENTER(g); MUTEX_ENTER(g);
g->p.cx = mf_get_string_width(font, str, 0, 0) + font->baseline_x; g->p.cx = mf_get_string_width(font, str, 0, 0) + font->baseline_x;
g->p.cy = font->height; g->p.cy = font->height;
@ -3275,6 +3283,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
uint16_t nbrLines; uint16_t nbrLines;
#endif #endif
if (!font)
return;
MUTEX_ENTER(g); MUTEX_ENTER(g);
g->t.font = font; g->t.font = font;
@ -3326,6 +3336,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
uint16_t nbrLines; uint16_t nbrLines;
#endif #endif
if (!font)
return;
MUTEX_ENTER(g); MUTEX_ENTER(g);
g->p.cx = cx; g->p.cx = cx;
@ -3382,6 +3394,8 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
} }
coord_t gdispGetFontMetric(font_t font, fontmetric_t metric) { coord_t gdispGetFontMetric(font_t font, fontmetric_t metric) {
if (!font)
return 0;
/* No mutex required as we only read static data */ /* No mutex required as we only read static data */
switch(metric) { switch(metric) {
case fontHeight: return font->height; case fontHeight: return font->height;
@ -3397,12 +3411,14 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co
} }
coord_t gdispGetCharWidth(char c, font_t font) { coord_t gdispGetCharWidth(char c, font_t font) {
if (!font)
return 0;
/* No mutex required as we only read static data */ /* No mutex required as we only read static data */
return mf_character_width(font, c); return mf_character_width(font, c);
} }
coord_t gdispGetStringWidthCount(const char* str, font_t font, uint16_t count) { coord_t gdispGetStringWidthCount(const char* str, font_t font, uint16_t count) {
if (!str) if (!str || !font)
return 0; return 0;
// No mutex required as we only read static data // No mutex required as we only read static data