diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2022-07-18 12:57:14 +0200 |
---|---|---|
committer | Kai Köhne <kai.koehne@qt.io> | 2022-07-22 14:25:26 +0200 |
commit | e79d7f12e6ca15c499a553e4a701a2887e4b184c (patch) | |
tree | 93138f4b91f0e56621836f6a46291cd219bfd641 /src/3rdparty/freetype/src/bdf/bdfdrivr.c | |
parent | 425a6415e7593c99c779b406ea5b30fd5975767c (diff) |
Update freetype to 2.12.1
ftdebug.c files are new, adapted the import script to copy the source
file for Windows as well.
Replaced the CMakeLists.txt content that was imported from the .pro file
with the respective variables and logic from the freetype CMakeLists.txt
file, which should make it easier to maintain this next time.
Pick-to: 6.4 6.3 6.2 5.15 5.12
Fixes: QTBUG-105032
Change-Id: I1e846167b268df4b1b0a50dcec602def1a0bdcb4
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Diffstat (limited to 'src/3rdparty/freetype/src/bdf/bdfdrivr.c')
-rw-r--r-- | src/3rdparty/freetype/src/bdf/bdfdrivr.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/3rdparty/freetype/src/bdf/bdfdrivr.c b/src/3rdparty/freetype/src/bdf/bdfdrivr.c index d29188b97b..eb73a7cf93 100644 --- a/src/3rdparty/freetype/src/bdf/bdfdrivr.c +++ b/src/3rdparty/freetype/src/bdf/bdfdrivr.c @@ -276,7 +276,7 @@ THE SOFTWARE. char* s; - if ( FT_ALLOC( face->style_name, len ) ) + if ( FT_QALLOC( face->style_name, len ) ) return error; s = face->style_name; @@ -442,7 +442,7 @@ THE SOFTWARE. bdfface->num_glyphs = (FT_Long)( font->glyphs_size + 1 ); bdfface->num_fixed_sizes = 1; - if ( FT_NEW_ARRAY( bdfface->available_sizes, 1 ) ) + if ( FT_NEW( bdfface->available_sizes ) ) goto Exit; { @@ -451,8 +451,6 @@ THE SOFTWARE. long value; - FT_ZERO( bsize ); - /* sanity checks */ if ( font->font_ascent > 0x7FFF || font->font_ascent < -0x7FFF ) { @@ -489,7 +487,7 @@ THE SOFTWARE. else { /* this is a heuristical value */ - bsize->width = (FT_Short)FT_MulDiv( bsize->height, 2, 3 ); + bsize->width = ( bsize->height * 2 + 1 ) / 3; } prop = bdf_get_font_property( font, "POINT_SIZE" ); @@ -608,7 +606,7 @@ THE SOFTWARE. unsigned long n; - if ( FT_NEW_ARRAY( face->en_table, font->glyphs_size ) ) + if ( FT_QNEW_ARRAY( face->en_table, font->glyphs_size ) ) goto Exit; face->default_glyph = 0; |