diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2019-01-04 03:05:53 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2019-01-04 03:06:44 +0300 |
| commit | 53d655a0b317edf4d05fd163e3ad6f09ec0c2b3b (patch) | |
| tree | f800a68113b86bd085046deeb09aaca3163a183e /source/blender/editors/interface/interface_style.c | |
| parent | 54a4c1cf359c369c8fc16ecf0ecaa92e6f650e2f (diff) | |
Cleanup: use typed unsigned ints
Diffstat (limited to 'source/blender/editors/interface/interface_style.c')
| -rw-r--r-- | source/blender/editors/interface/interface_style.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/editors/interface/interface_style.c b/source/blender/editors/interface/interface_style.c index d36786fed72..94bed87b40b 100644 --- a/source/blender/editors/interface/interface_style.c +++ b/source/blender/editors/interface/interface_style.c @@ -224,7 +224,7 @@ void UI_fontstyle_draw( } /* drawn same as above, but at 90 degree angle */ -void UI_fontstyle_draw_rotated(const uiFontStyle *fs, const rcti *rect, const char *str, const unsigned char col[4]) +void UI_fontstyle_draw_rotated(const uiFontStyle *fs, const rcti *rect, const char *str, const uchar col[4]) { float height; int xofs, yofs; @@ -285,7 +285,7 @@ void UI_fontstyle_draw_rotated(const uiFontStyle *fs, const rcti *rect, const ch * * For drawing on-screen labels. */ -void UI_fontstyle_draw_simple(const uiFontStyle *fs, float x, float y, const char *str, const unsigned char col[4]) +void UI_fontstyle_draw_simple(const uiFontStyle *fs, float x, float y, const char *str, const uchar col[4]) { if (fs->kerning == 1) BLF_enable(fs->uifont_id, BLF_KERNING_DEFAULT); @@ -411,7 +411,7 @@ void uiStyleInit(void) uiFont *font; uiStyle *style = U.uistyles.first; int monofont_size = datatoc_bmonofont_ttf_size; - unsigned char *monofont_ttf = (unsigned char *)datatoc_bmonofont_ttf; + uchar *monofont_ttf = (uchar *)datatoc_bmonofont_ttf; /* recover from uninitialized dpi */ if (U.dpi == 0) @@ -454,7 +454,7 @@ void uiStyleInit(void) if (font->uifont_id == UIFONT_DEFAULT) { #ifdef WITH_INTERNATIONAL int font_size = datatoc_bfont_ttf_size; - unsigned char *font_ttf = (unsigned char *)datatoc_bfont_ttf; + uchar *font_ttf = (uchar *)datatoc_bfont_ttf; static int last_font_size = 0; /* use unicode font for translation */ @@ -464,7 +464,7 @@ void uiStyleInit(void) if (!font_ttf) { /* fall back if not found */ font_size = datatoc_bfont_ttf_size; - font_ttf = (unsigned char *)datatoc_bfont_ttf; + font_ttf = (uchar *)datatoc_bfont_ttf; } } @@ -476,13 +476,13 @@ void uiStyleInit(void) font->blf_id = BLF_load_mem("default", font_ttf, font_size); #else - font->blf_id = BLF_load_mem("default", (unsigned char *)datatoc_bfont_ttf, datatoc_bfont_ttf_size); + font->blf_id = BLF_load_mem("default", (uchar *)datatoc_bfont_ttf, datatoc_bfont_ttf_size); #endif } else { font->blf_id = BLF_load(font->filename); if (font->blf_id == -1) { - font->blf_id = BLF_load_mem("default", (unsigned char *)datatoc_bfont_ttf, datatoc_bfont_ttf_size); + font->blf_id = BLF_load_mem("default", (uchar *)datatoc_bfont_ttf, datatoc_bfont_ttf_size); } } @@ -515,7 +515,7 @@ void uiStyleInit(void) if (!monofont_ttf) { /* fall back if not found */ monofont_size = datatoc_bmonofont_ttf_size; - monofont_ttf = (unsigned char *)datatoc_bmonofont_ttf; + monofont_ttf = (uchar *)datatoc_bmonofont_ttf; } } #endif |