diff options
Diffstat (limited to 'source/blender/blenfont/intern')
-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 | 18 | ||||
-rw-r--r-- | source/blender/blenfont/intern/blf_internal_types.h | 2 |
5 files changed, 20 insertions, 20 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 38c1498d76b..2a8fc14f4ae 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -164,7 +164,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 c82515ff41c..fe9769dd2d1 100644 --- a/source/blender/blenfont/intern/blf_font.c +++ b/source/blender/blenfont/intern/blf_font.c @@ -343,7 +343,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 b5fe29ae2d9..9af347908e1 100644 --- a/source/blender/blenfont/intern/blf_glyph.c +++ b/source/blender/blenfont/intern/blf_glyph.c @@ -245,11 +245,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); @@ -336,13 +336,13 @@ static void blf_texture_draw(float uv[2][2], float dx, float y1, float dx1, floa glBegin(GL_QUADS); glTexCoord2f(uv[0][0], uv[0][1]); glVertex2f(dx, y1); - + glTexCoord2f(uv[0][0], uv[1][1]); glVertex2f(dx, y2); - + glTexCoord2f(uv[1][0], uv[1][1]); glVertex2f(dx1, y2); - + glTexCoord2f(uv[1][0], uv[0][1]); glVertex2f(dx1, y1); glEnd(); @@ -355,7 +355,7 @@ static void blf_texture5_draw(const float shadow_col[4], float uv[2][2], float x 2 / 60.0f, 5 / 60.0f, 8 / 60.0f, 5 / 60.0f, 2 / 60.0f, 1 / 60.0f, 3 / 60.0f, 5 / 60.0f, 3 / 60.0f, 1 / 60.0f, 1 / 60.0f, 1 / 60.0f, 2 / 60.0f, 1 / 60.0f, 1 / 60.0f}; - + const float *fp = soft; float color[4]; float dx, dy; @@ -363,7 +363,7 @@ static void blf_texture5_draw(const float shadow_col[4], float uv[2][2], float x color[0] = shadow_col[0]; color[1] = shadow_col[1]; color[2] = shadow_col[2]; - + for (dx = -2; dx < 3; dx++) { for (dy = -2; dy < 3; dy++, fp++) { color[3] = *(fp) * shadow_col[3]; @@ -371,7 +371,7 @@ static void blf_texture5_draw(const float shadow_col[4], float uv[2][2], float x blf_texture_draw(uv, x1 + dx, y1 + dy, x2 + dx, y2 + dy); } } - + glColor4fv(color); } @@ -396,7 +396,7 @@ static void blf_texture3_draw(const float shadow_col[4], float uv[2][2], float x blf_texture_draw(uv, x1 + dx, y1 + dy, x2 + dx, y2 + dy); } } - + glColor4fv(color); } diff --git a/source/blender/blenfont/intern/blf_internal_types.h b/source/blender/blenfont/intern/blf_internal_types.h index 17bafa81458..5723f08d44b 100644 --- a/source/blender/blenfont/intern/blf_internal_types.h +++ b/source/blender/blenfont/intern/blf_internal_types.h @@ -174,7 +174,7 @@ typedef struct FontBLF { /* angle in radians. */ float angle; - + /* blur: 3 or 5 large kernel */ int blur; |