diff options
author | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
---|---|---|
committer | Alexander Pinzon Fernandez <apinzonf@gmail.com> | 2013-12-11 20:10:22 +0400 |
commit | 2658a3c1b44717f497f187a38000c804eb37bbba (patch) | |
tree | ee55c673feabced8b6ec8bf9a8aa4d82a3cda3db /source/blender/blenfont/intern/blf.c | |
parent | 4005cb1c6a63a217df0e887c741beee2c1359301 (diff) | |
parent | 09b859d03f0ee138c4273ef8460e91d9888387a1 (diff) |
Merge branch 'master' into soc-2013-sketch_meshsoc-2013-sketch_mesh
Conflicts:
release/scripts/addons
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/object/object_modifier.c
source/blender/makesrna/intern/rna_modifier.c
source/blender/modifiers/intern/MOD_laplaciandeform.c
Diffstat (limited to 'source/blender/blenfont/intern/blf.c')
-rw-r--r-- | source/blender/blenfont/intern/blf.c | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c index 130eaaecba5..746ee3c0d93 100644 --- a/source/blender/blenfont/intern/blf.c +++ b/source/blender/blenfont/intern/blf.c @@ -592,44 +592,44 @@ int BLF_draw_mono(int fontid, const char *str, size_t len, int cwidth) return columns; } -void BLF_boundbox(int fontid, const char *str, rctf *box) +void BLF_boundbox(int fontid, const char *str, size_t len, rctf *box) { FontBLF *font = blf_get(fontid); if (font) { - blf_font_boundbox(font, str, box); + blf_font_boundbox(font, str, len, box); } } -void BLF_width_and_height(int fontid, const char *str, float *width, float *height) +void BLF_width_and_height(int fontid, const char *str, size_t len, float *r_width, float *r_height) { FontBLF *font = blf_get(fontid); if (font && font->glyph_cache) { - blf_font_width_and_height(font, str, width, height); + blf_font_width_and_height(font, str, len, r_width, r_height); } else { - *width = *height = 0.0f; + *r_width = *r_height = 0.0f; } } -void BLF_width_and_height_default(const char *str, float *width, float *height) +void BLF_width_and_height_default(const char *str, size_t len, float *r_width, float *r_height) { if (!blf_global_font_init()) { - *width = *height = 0.0f; + *r_width = *r_height = 0.0f; return; } BLF_size(global_font_default, global_font_points, global_font_dpi); - BLF_width_and_height(global_font_default, str, width, height); + BLF_width_and_height(global_font_default, str, len, r_width, r_height); } -float BLF_width(int fontid, const char *str) +float BLF_width(int fontid, const char *str, size_t len) { FontBLF *font = blf_get(fontid); if (font && font->glyph_cache) { - return blf_font_width(font, str); + return blf_font_width(font, str, len); } return 0.0f; @@ -646,21 +646,21 @@ float BLF_fixed_width(int fontid) return 0.0f; } -float BLF_width_default(const char *str) +float BLF_width_default(const char *str, size_t len) { if (!blf_global_font_init()) return 0.0f; BLF_size(global_font_default, global_font_points, global_font_dpi); - return BLF_width(global_font_default, str); + return BLF_width(global_font_default, str, len); } -float BLF_height(int fontid, const char *str) +float BLF_height(int fontid, const char *str, size_t len) { FontBLF *font = blf_get(fontid); if (font && font->glyph_cache) { - return blf_font_height(font, str); + return blf_font_height(font, str, len); } return 0.0f; @@ -710,14 +710,14 @@ float BLF_ascender(int fontid) return 0.0f; } -float BLF_height_default(const char *str) +float BLF_height_default(const char *str, size_t len) { if (!blf_global_font_init()) return 0.0f; BLF_size(global_font_default, global_font_points, global_font_dpi); - return BLF_height(global_font_default, str); + return BLF_height(global_font_default, str, len); } void BLF_rotation(int fontid, float angle) |