[Bf-blender-cvs] [aed5a277555] master: Correct build error from 0d7aab2375e6bb06e89dad851550b283a1ff805c

[Campbell Barton]

Commit: aed5a27755531aeef1e6f7a19dbde066cd9f2aba
Author: Campbell Barton
Date:   Sat Aug 21 13:22:47 2021 +1000
Branches: master
https://developer.blender.org/rBaed5a27755531aeef1e6f7a19dbde066cd9f2aba

Correct build error from 0d7aab2375e6bb06e89dad851550b283a1ff805c

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

M	source/blender/blenfont/intern/blf_font.c

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

diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 02847b74df1..436c4712e25 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -352,11 +352,11 @@ static int blf_unscaled_F26Dot6_to_pixels(FontBLF *font, FT_Pos value)
   }
 
   /* Copies of internal FreeType macros needed here. */
-#define FT_PIX_FLOOR(x) ((x) & ~FT_TYPEOF(x) 63)
+#define FT_PIX_FLOOR(x) ((x) & ~63)
 #define FT_PIX_ROUND(x) FT_PIX_FLOOR((x) + 32)
 
   /* Round to even 64ths, then divide by 64. */
-  return FT_PIX_ROUND(scaled) >> 6;
+  return (int)FT_PIX_ROUND(scaled) >> 6;
 
 #undef FT_PIX_FLOOR
 #undef FT_PIX_ROUND
@@ -385,7 +385,7 @@ BLI_INLINE void blf_kerning_step_fast(FontBLF *font,
 
     /* If ASCII we save this value to our cache for quicker access next time. */
     if ((c_prev < KERNING_CACHE_TABLE_SIZE) && (c < GLYPH_ASCII_TABLE_SIZE)) {
-      font->kerning_cache->ascii_table[c][c_prev] = delta.x;
+      font->kerning_cache->ascii_table[c][c_prev] = (int)delta.x;
     }
 
     if (delta.x != 0) {