From d42679b93d5e77fe769591cd1d04522225940556 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Fri, 25 Aug 2023 18:05:01 +0200 Subject: [PATCH] Fix clang warnings. * src/cffload.c (cff_blend_doBlend): Fix type of `sum`. * src/truetype/ttgxvar.c (tt_var_load_item_variation_store): Fix type of `word_delta_count`. --- src/cff/cffload.c | 2 +- src/truetype/ttgxvar.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cff/cffload.c b/src/cff/cffload.c index bee89f0c6..af79082e9 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -1361,7 +1361,7 @@ for ( i = 0; i < numBlends; i++ ) { const FT_Int32* weight = &blend->BV[1]; - FT_UInt32 sum; + FT_Fixed sum; /* convert inputs to 16.16 fixed point */ diff --git a/src/truetype/ttgxvar.c b/src/truetype/ttgxvar.c index 8c713f1b6..ad4f266b2 100644 --- a/src/truetype/ttgxvar.c +++ b/src/truetype/ttgxvar.c @@ -621,10 +621,10 @@ { GX_ItemVarData varData = &itemStore->varData[i]; - FT_UInt item_count; - FT_UInt word_delta_count; - FT_UInt region_idx_count; - FT_UInt per_region_size; + FT_UInt item_count; + FT_UShort word_delta_count; + FT_UInt region_idx_count; + FT_UInt per_region_size; if ( FT_STREAM_SEEK( offset + dataOffsetArray[i] ) )