code cleanup: includes and correction for macro
authorCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2012 09:45:30 +0000 (09:45 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Tue, 21 Aug 2012 09:45:30 +0000 (09:45 +0000)
source/blender/blenfont/intern/blf_dir.c
source/blender/blenfont/intern/blf_font.c
source/blender/blenfont/intern/blf_glyph.c

index 4fde9fe67871529185069a0ad4cb8af8f37d72ca..da9160673025483b2f73263cf3e56b158e107bbf 100644 (file)
 
 #include "BKE_utildefines.h"
 
-#include "BLI_blenlib.h"
+#include "BLI_fileops.h"
+#include "BLI_listbase.h"
+#include "BLI_path_util.h"
+#include "BLI_string.h"
 
 #include "BIF_gl.h"
 
index 509a092fabdfca9406d3d9f7be50a6c9aaacdfbe..d47fa5383d44daa298e0f68413ba44d76e4489d6 100644 (file)
 
 #include "DNA_vec_types.h"
 
-
-#include "BLI_blenlib.h"
-#include "BLI_linklist.h"  /* linknode */
+#include "BLI_listbase.h"
 #include "BLI_math.h"
+#include "BLI_rect.h"
+#include "BLI_string.h"
+#include "BLI_string_utf8.h"
+#include "BLI_linklist.h"  /* linknode */
 
 #include "BIF_gl.h"
 #include "BLF_api.h"
@@ -152,7 +154,7 @@ static void blf_font_ensure_ascii_table(FontBLF *font)
                                   _kern_mode,                                           \
                                   &(_delta)) == 0)                                      \
                {                                                                        \
-                       _pen_x += delta.x >> 6;                                              \
+                       _pen_x += _delta.x >> 6;                                             \
                }                                                                        \
        }                                                                            \
 } (void)0
index 3e871fefff8b96622133d9de449d9fc56720e9e6..302edd8d5330b8bb19abe8d579e9a124dfc339f2 100644 (file)
@@ -46,7 +46,8 @@
 #include "DNA_vec_types.h"
 #include "DNA_userdef_types.h"
 
-#include "BLI_blenlib.h"
+#include "BLI_listbase.h"
+#include "BLI_rect.h"
 
 #include "BIF_gl.h"
 #include "BLF_api.h"
@@ -314,13 +315,14 @@ static void blf_texture_draw(float uv[2][2], float dx, float y1, float dx1, floa
 
 static void blf_texture5_draw(const float shadow_col[4], float uv[2][2], float x1, float y1, float x2, float y2)
 {
-       float soft[25] = {1 / 60.0f, 1 / 60.0f, 2 / 60.0f, 1 / 60.0f, 1 / 60.0f,
-                         1 / 60.0f, 3 / 60.0f, 5 / 60.0f, 3 / 60.0f, 1 / 60.0f,
-                         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 soft[25] = {1 / 60.0f, 1 / 60.0f, 2 / 60.0f, 1 / 60.0f, 1 / 60.0f,
+                               1 / 60.0f, 3 / 60.0f, 5 / 60.0f, 3 / 60.0f, 1 / 60.0f,
+                               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};
        
-       float color[4], *fp = soft;
+       const float *fp = soft;
+       float color[4];
        int dx, dy;
 
        color[0] = shadow_col[0];
@@ -340,11 +342,12 @@ static void blf_texture5_draw(const float shadow_col[4], float uv[2][2], float x
 
 static void blf_texture3_draw(const float shadow_col[4], float uv[2][2], float x1, float y1, float x2, float y2)
 {
-       float soft[9] = {1 / 16.0f, 2 / 16.0f, 1 / 16.0f,
-                        2 / 16.0f, 4 / 16.0f, 2 / 16.0f,
-                        1 / 16.0f, 2 / 16.0f, 1 / 16.0f};
+       const float soft[9] = {1 / 16.0f, 2 / 16.0f, 1 / 16.0f,
+                              2 / 16.0f, 4 / 16.0f, 2 / 16.0f,
+                              1 / 16.0f, 2 / 16.0f, 1 / 16.0f};
 
-       float color[4], *fp = soft;
+       const float *fp = soft;
+       float color[4];
        int dx, dy;
 
        color[0] = shadow_col[0];