diff --git a/source/blender/blenfont/intern/blf_font.c b/source/blender/blenfont/intern/blf_font.c
index 8ee17bb6966..5eb33c5a2f2 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -328,7 +328,7 @@ BLI_INLINE void blf_kerning_step_fast(FontBLF *font,
                                       int *pen_x_p)
 {
   if (g_prev && font->char_spacing != 0.0f) {
-    float space = font->size * font->char_spacing / 6.0f;
+    float space = (float)font->size * (font->char_spacing / 6.0f);
     *pen_x_p += (int)space;
   }
 
@@ -1306,7 +1306,7 @@ int blf_get_var_axis_index(FontBLF *font, char *name)
   if (!font->variations) {
     return -1;
   }
-  for (FT_UInt i = 0; i < font->variations->num_axis; i++) {
+  for (int i = 0; i < (int)font->variations->num_axis; i++) {
     if (strcmp(font->variations->axis[i].name, name) == 0) {
       return i;
     }
diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index 334c4de9249..aa2bc6f0ed2 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -204,13 +204,13 @@ void blf_set_var_axis_float(FontBLF *font, FT_Fixed *coords, int axis_index, flo
 
   FT_Fixed int_value = axis->def;
   if (value > 0) {
-    int_value += (int)((axis->maximum - axis->def) * value);
+    int_value += (int)((double)(axis->maximum - axis->def) * value);
   }
   else if (value < 0) {
-    int_value += (int)((axis->def - axis->minimum) * value);
+    int_value += (int)((double)(axis->def - axis->minimum) * value);
   }
 
-  blf_set_var_axis_int(&coords[0], axis_index, int_value);
+  blf_set_var_axis_int(&coords[0], axis_index, (int)int_value);
 }
 
 GlyphBLF *blf_glyph_add(FontBLF *font, GlyphCacheBLF *gc, unsigned int index, unsigned int c)
@@ -246,7 +246,7 @@ GlyphBLF *blf_glyph_add(FontBLF *font, GlyphCacheBLF *gc, unsigned int index, un
     blf_set_var_axis_float(font, &coords[0], font->weight_axis, font->char_weight);
     blf_set_var_axis_float(font, &coords[0], font->width_axis, font->char_width);
     blf_set_var_axis_float(font, &coords[0], font->slant_axis, font->char_slant);
-    blf_set_var_axis_int(&coords[0], font->optical_size_axis, font->size << 6);
+    blf_set_var_axis_int(&coords[0], font->optical_size_axis, (int)font->size << 6);
     FT_Set_Var_Design_Coordinates(font->face, 10, &coords[0]);
   }
 
@@ -281,7 +281,7 @@ GlyphBLF *blf_glyph_add(FontBLF *font, GlyphCacheBLF *gc, unsigned int index, un
   if (font->char_weight != 0.0f && font->weight_axis == -1) {
     /* Fake bold if the font does not have this variable axis. */
     float scale = (font->char_weight * 0.15f); /* -0.2f - 0.2f */
-    int change = (int)(font->face->glyph->metrics.width * scale);
+    int change = (int)(font->face->glyph->metrics.width * (int)scale);
     FT_Outline_EmboldenXY(&font->face->glyph->outline, change, change / 2);
     if ((font->face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) == 0) {
       /* Need to increase advance, but not for fixed-width fonts. */
@@ -300,11 +300,11 @@ GlyphBLF *blf_glyph_add(FontBLF *font, GlyphCacheBLF *gc, unsigned int index, un
     FT_Matrix matrix = {to_16dot16(scale), 0, 0, to_16dot16(1)};
     FT_Outline_Transform(&font->face->glyph->outline, &matrix);
     if ((font->face->face_flags & FT_FACE_FLAG_FIXED_WIDTH) == 0) {
-      font->face->glyph->advance.x = (int)(font->face->glyph->advance.x * scale);
+      font->face->glyph->advance.x = (int)(font->face->glyph->advance.x * (int)scale);
     }
     else {
       /* TODO: fixed-pitch font gets a nudge left or right. */
-      //FT_Outline_Translate(&font->face->glyph->outline, (extra_x / -2), 0);
+      // FT_Outline_Translate(&font->face->glyph->outline, (extra_x / -2), 0);
     }
   }