[Bf-blender-cvs] [56bf92f0f6d] master: Cleanup: Calm GCC Conversion Warning

Harley Acheson noreply at git.blender.org
Thu Jul 7 23:30:25 CEST 2022


Commit: 56bf92f0f6df8684c5ffb63ffa7218322eedf574
Author: Harley Acheson
Date:   Thu Jul 7 14:29:37 2022 -0700
Branches: master
https://developer.blender.org/rB56bf92f0f6df8684c5ffb63ffa7218322eedf574

Cleanup: Calm GCC Conversion Warning

Commit b9c0eed206b0 introduced a GCC conversion warning because of an
assignment of a long int value to an int.

Own Code

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

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

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

diff --git a/source/blender/blenfont/intern/blf_glyph.c b/source/blender/blenfont/intern/blf_glyph.c
index 4db083366c3..103919e86f2 100644
--- a/source/blender/blenfont/intern/blf_glyph.c
+++ b/source/blender/blenfont/intern/blf_glyph.c
@@ -843,7 +843,7 @@ static bool blf_glyph_transform_width(FT_GlyphSlot glyph, float factor)
 static bool blf_glyph_transform_spacing(FT_GlyphSlot glyph, float factor)
 {
   if (glyph->advance.x > 0) {
-    const int size = glyph->face->size->metrics.height;
+    const long int size = glyph->face->size->metrics.height;
     glyph->advance.x += (FT_Pos)(factor * (float)size / 6.0f);
     return true;
   }



More information about the Bf-blender-cvs mailing list