diff options
| author | Werner Lemberg <wl@gnu.org> | 2023-05-08 07:22:59 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2023-05-08 07:22:59 +0200 |
| commit | 5edd6d52b1b610c9f4445f0ca941a624d2ad56c3 (patch) | |
| tree | 5dba770ae57cd11c15f394a91d2b0932cf1b7177 | |
| parent | bd37b8471803a006c0bfb14470293d5dc1c297ea (diff) | |
| download | freetype2-5edd6d52b1b610c9f4445f0ca941a624d2ad56c3.tar.gz | |
Minor compiler warning fixes.
* src/autofit/afcjk.c (af_cjk_get_standard_widths), src/autofit/aflatin.c
(af_latin_get_standard_widths): Use `FT_CALLBACK_DEF`.
* src/cff/cffparse.c (cff_parser_run): Initialize and fix allocation of `q`.
| -rw-r--r-- | src/autofit/afcjk.c | 2 | ||||
| -rw-r--r-- | src/autofit/aflatin.c | 2 | ||||
| -rw-r--r-- | src/cff/cffparse.c | 6 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/autofit/afcjk.c b/src/autofit/afcjk.c index fdb8e8f6d..3466bb9f9 100644 --- a/src/autofit/afcjk.c +++ b/src/autofit/afcjk.c @@ -773,7 +773,7 @@ /* Extract standard_width from writing system/script specific */ /* metrics class. */ - FT_LOCAL_DEF( void ) + FT_CALLBACK_DEF( void ) af_cjk_get_standard_widths( AF_StyleMetrics metrics_, /* AF_CJKMetrics */ FT_Pos* stdHW, FT_Pos* stdVW ) diff --git a/src/autofit/aflatin.c b/src/autofit/aflatin.c index e98861c3a..6f672d593 100644 --- a/src/autofit/aflatin.c +++ b/src/autofit/aflatin.c @@ -1506,7 +1506,7 @@ /* Extract standard_width from writing system/script specific */ /* metrics class. */ - FT_LOCAL_DEF( void ) + FT_CALLBACK_DEF( void ) af_latin_get_standard_widths( AF_StyleMetrics metrics_, /* AF_LatinMetrics */ FT_Pos* stdHW, FT_Pos* stdVW ) diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c index 89a0263b7..c850dfc61 100644 --- a/src/cff/cffparse.c +++ b/src/cff/cffparse.c @@ -1200,8 +1200,8 @@ FT_Byte* charstring_base; FT_ULong charstring_len; - FT_Fixed* stack; - FT_Byte* q; + FT_Fixed* stack; + FT_Byte* q = NULL; charstring_base = ++p; @@ -1243,7 +1243,7 @@ /* converting it back to charstring number representations */ /* (this is ugly, I know). */ /* The maximum required size is 5 bytes per stack element. */ - if ( FT_QALLOC( q, 2 * sizeof ( FT_ListNode ) + + if ( FT_QALLOC( q, (FT_Long)( 2 * sizeof ( FT_ListNode ) ) + 5 * ( decoder.top - decoder.stack ) ) ) goto Exit; |