diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:10:35 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-08 09:10:35 +0300 |
commit | 908b6960c01ffb1665af56ff6f03aaa3eac5366a (patch) | |
tree | db609864fbe601073212b4c37541a7965ea96ea5 /source/blender/blenfont | |
parent | d352a0adc5dadd0bfdc3b1b1ac76d92be689966b (diff) | |
parent | a25c11fd8d602236f36c34c342453149bdc1d909 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenfont')
-rw-r--r-- | source/blender/blenfont/intern/blf.c | 2 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_dir.c | 16 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_font.c | 2 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_glyph.c | 4 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_internal_types.h | 2 |
5 files changed, 13 insertions, 13 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index fafee125264..5dd692d3855 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -172,7 +172,7 @@ static int blf_search_available(void) for (i = 0; i < BLF_MAX_FONT; i++) if (!global_font[i]) return i; - + return -1; } diff --git a/source/blender/blenfont/intern/blf_dir.c b/source/blender/blenfont/intern/blf_dir.c index d3349a10834..ff5c1151a82 100644 --- a/source/blender/blenfont/intern/blf_dir.c +++ b/source/blender/blenfont/intern/blf_dir.c @@ -61,7 +61,7 @@ static ListBase global_font_dir = { NULL, NULL }; static DirBLF *blf_dir_find(const char *path) { DirBLF *p; - + p = global_font_dir.first; while (p) { if (BLI_path_cmp(p->path, path) == 0) @@ -74,11 +74,11 @@ static DirBLF *blf_dir_find(const char *path) void BLF_dir_add(const char *path) { DirBLF *dir; - + dir = blf_dir_find(path); if (dir) /* already in the list ? just return. */ return; - + dir = (DirBLF *)MEM_callocN(sizeof(DirBLF), "BLF_dir_add"); dir->path = BLI_strdup(path); BLI_addhead(&global_font_dir, dir); @@ -87,7 +87,7 @@ void BLF_dir_add(const char *path) void BLF_dir_rem(const char *path) { DirBLF *dir; - + dir = blf_dir_find(path); if (dir) { BLI_remlink(&global_font_dir, dir); @@ -102,11 +102,11 @@ char **BLF_dir_get(int *ndir) char **dirs; char *path; int i, count; - + count = BLI_listbase_count(&global_font_dir); if (!count) return NULL; - + dirs = (char **)MEM_callocN(sizeof(char *) * count, "BLF_dir_get"); p = global_font_dir.first; i = 0; @@ -123,7 +123,7 @@ void BLF_dir_free(char **dirs, int count) { char *path; int i; - + for (i = 0; i < count; i++) { path = dirs[i]; MEM_freeN(path); @@ -159,7 +159,7 @@ int blf_dir_split(const char *str, char *file, int *size) { int i, len; char *s; - + /* Window, Linux or Mac, this is always / */ s = strrchr(str, '/'); if (s) { diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c index c31aacb0a54..1289dc6c5a6 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -553,7 +553,7 @@ static void blf_font_draw_buffer_ex( width_clip -= chx + width_clip - buf_info->w; if (height_clip + pen_y > buf_info->h) height_clip -= pen_y + height_clip - buf_info->h; - + /* drawing below the image? */ if (pen_y < 0) { yb_start += (g->pitch < 0) ? -pen_y : pen_y; diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c index f3789bee1fd..5a87c726566 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -292,11 +292,11 @@ GlyphBLF *blf_glyph_add(FontBLF *font, unsigned int index, unsigned int c) if (font->flags & BLF_HINTING) flags &= ~FT_LOAD_NO_HINTING; - + if (is_sharp) err = FT_Load_Glyph(font->face, (FT_UInt)index, FT_LOAD_TARGET_MONO); else - err = FT_Load_Glyph(font->face, (FT_UInt)index, flags); + err = FT_Load_Glyph(font->face, (FT_UInt)index, flags); if (err) { BLI_spin_unlock(font->ft_lib_mutex); diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index 5b9d3f1eb5b..d7b526735d1 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -204,7 +204,7 @@ typedef struct FontBLF { /* angle in radians. */ float angle; - + #if 0 /* BLF_BLUR_ENABLE */ /* blur: 3 or 5 large kernel */ int blur; |