[Bf-blender-cvs] [6c73338] temp-blf-wordwrap: rename blf_font_buffer -> blf_font_draw_buffer

[Campbell Barton]

Commit: 6c73338fb8ea27e7af580145e4971987350b677b
Author: Campbell Barton
Date:   Fri Sep 18 04:43:55 2015 +1000
Branches: temp-blf-wordwrap
https://developer.blender.org/rB6c73338fb8ea27e7af580145e4971987350b677b

rename blf_font_buffer -> blf_font_draw_buffer

===================================================================

M	source/blender/blenfont/intern/blf.c
M	source/blender/blenfont/intern/blf_font.c
M	source/blender/blenfont/intern/blf_internal.h
M	source/blender/blenfont/intern/blf_thumbs.c

===================================================================

diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index 1eb86c8..12a1b08 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -916,10 +916,10 @@ void BLF_draw_buffer_ex(
 
 	if (font && font->glyph_cache && (font->buf_info.fbuf || font->buf_info.cbuf)) {
 		if (font->flags & BLF_WORD_WRAP) {
-			blf_font_buffer__wrap(font, str, len, r_info);
+			blf_font_draw_buffer__wrap(font, str, len, r_info);
 		}
 		else {
-			blf_font_buffer(font, str, len, r_info);
+			blf_font_draw_buffer(font, str, len, r_info);
 		}
 	}
 }
diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 69c6cd1..21427a1 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -290,7 +290,7 @@ int blf_font_draw_mono(FontBLF *font, const char *str, size_t len, int cwidth)
 }
 
 /* Sanity checks are done by BLF_draw_buffer() */
-static void blf_font_buffer_ex(
+static void blf_font_draw_buffer_ex(
         FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info,
         int pen_y)
 {
@@ -460,10 +460,10 @@ static void blf_font_buffer_ex(
 		r_info->width = pen_x;
 	}
 }
-void blf_font_buffer(
+void blf_font_draw_buffer(
         FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info)
 {
-	blf_font_buffer_ex(font, str, len, r_info, 0);
+	blf_font_draw_buffer_ex(font, str, len, r_info, 0);
 }
 
 size_t blf_font_width_to_strlen(FontBLF *font, const char *str, size_t len, float width, float *r_width)
@@ -792,14 +792,14 @@ void blf_font_boundbox__wrap(FontBLF *font, const char *str, size_t len, rctf *b
 	blf_font_wrap_apply(font, str, len, r_info, blf_font_boundbox_wrap_cb, box);
 }
 
-/* blf_font_buffer__wrap */
-static void blf_font_buffer__wrap_cb(FontBLF *font, const char *str, size_t len, int pen_y, void *UNUSED(userdata))
+/* blf_font_draw_buffer__wrap */
+static void blf_font_draw_buffer__wrap_cb(FontBLF *font, const char *str, size_t len, int pen_y, void *UNUSED(userdata))
 {
-	blf_font_buffer_ex(font, str, len, NULL, pen_y);
+	blf_font_draw_buffer_ex(font, str, len, NULL, pen_y);
 }
-void blf_font_buffer__wrap(FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info)
+void blf_font_draw_buffer__wrap(FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info)
 {
-	blf_font_wrap_apply(font, str, len, r_info, blf_font_buffer__wrap_cb, NULL);
+	blf_font_wrap_apply(font, str, len, r_info, blf_font_draw_buffer__wrap_cb, NULL);
 }
 
 /** \} */
diff --git a/source/blender/blenfont/intern/blf_internal.h b/source/blender/blenfont/intern/blf_internal.h
index ce6e763..55bc61e 100644
--- a/source/blender/blenfont/intern/blf_internal.h
+++ b/source/blender/blenfont/intern/blf_internal.h
@@ -56,8 +56,8 @@ void blf_font_draw(struct FontBLF *font, const char *str, size_t len, struct Res
 void blf_font_draw__wrap(struct FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info);
 void blf_font_draw_ascii(struct FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info);
 int blf_font_draw_mono(struct FontBLF *font, const char *str, size_t len, int cwidth);
-void blf_font_buffer(struct FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info);
-void blf_font_buffer__wrap(struct FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info);
+void blf_font_draw_buffer(struct FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info);
+void blf_font_draw_buffer__wrap(struct FontBLF *font, const char *str, size_t len, struct ResultBLF *r_info);
 size_t blf_font_width_to_strlen(struct FontBLF *font, const char *str, size_t len, float width, float *r_width);
 size_t blf_font_width_to_rstrlen(struct FontBLF *font, const char *str, size_t len, float width, float *r_width);
 void blf_font_boundbox(struct FontBLF *font, const char *str, size_t len, struct rctf *r_box, struct ResultBLF *r_info);
diff --git a/source/blender/blenfont/intern/blf_thumbs.c b/source/blender/blenfont/intern/blf_thumbs.c
index 9b59eb4..a2ba376 100644
--- a/source/blender/blenfont/intern/blf_thumbs.c
+++ b/source/blender/blenfont/intern/blf_thumbs.c
@@ -110,10 +110,10 @@ void BLF_thumb_preview(
 		if (blf_font_count_missing_chars(
 		        font, draw_str_i18n, draw_str_i18n_len, &draw_str_i18n_nbr) > (draw_str_i18n_nbr / 2))
 		{
-			blf_font_buffer(font, draw_str[i], (size_t)draw_str_i18n_nbr, NULL);
+			blf_font_draw_buffer(font, draw_str[i], (size_t)draw_str_i18n_nbr, NULL);
 		}
 		else {
-			blf_font_buffer(font, draw_str_i18n, draw_str_i18n_len, NULL);
+			blf_font_draw_buffer(font, draw_str_i18n, draw_str_i18n_len, NULL);
 		}
 	}