[Bf-blender-cvs] [8b467313965] master: Fix Build Warnings in blf_font.c
Harley Acheson
noreply at git.blender.org
Thu Aug 4 23:41:10 CEST 2022
Commit: 8b467313965ac5ea86d71e6ac90c0e9f54f2c830
Author: Harley Acheson
Date: Thu Aug 4 14:40:11 2022 -0700
Branches: master
https://developer.blender.org/rB8b467313965ac5ea86d71e6ac90c0e9f54f2c830
Fix Build Warnings in blf_font.c
Function made static, unused argument, type conversion
Introduced in 9d77b5a0ed7b
Own Code.
===================================================================
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 372dc19d64a..07b66d0728e 100644
--- a/source/blender/blenfont/intern/blf_font.c
+++ b/source/blender/blenfont/intern/blf_font.c
@@ -81,10 +81,10 @@ static void blf_face_finalizer(void *object)
}
/* Called in response to FTC_Manager_LookupFace. Add a face to our font. */
-FT_Error blf_cache_face_requester(FTC_FaceID faceID,
- FT_Library lib,
- FT_Pointer reqData,
- FT_Face *face)
+static FT_Error blf_cache_face_requester(FTC_FaceID faceID,
+ FT_Library lib,
+ FT_Pointer UNUSED(reqData),
+ FT_Face *face)
{
FontBLF *font = (FontBLF *)faceID;
int err = FT_Err_Cannot_Open_Resource;
@@ -1526,7 +1526,7 @@ bool blf_font_size(FontBLF *font, float size, unsigned int dpi)
}
/* FreeType uses fixed-point integers in 64ths. */
- FT_F26Dot6 ft_size = lroundf(size * 64.0f);
+ FT_UInt ft_size = lroundf(size * 64.0f);
/* Adjust our new size to be on even 64ths. */
size = (float)ft_size / 64.0f;
More information about the Bf-blender-cvs
mailing list