lv_gauge: updated, math_base: min max rename

2017-01-10 08:36:12 +01:00
parent f85741be30
commit 1dc0438827
9 changed files with 272 additions and 116 deletions
--- a/lv_misc/text.c
+++ b/lv_misc/text.c
@@ -56,7 +56,7 @@ void txt_get_size(point_t * size_res, const char * text, const font_t * font,
 		act_line_length = txt_get_width(&text[line_start], new_line_start - line_start,
 									   font, letter_space);

-		size_res->x = max(act_line_length, size_res->x);
+		size_res->x = MATH_MAX(act_line_length, size_res->x);
 		line_start = new_line_start;
    }