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`.
This commit is contained in:
parent
bd37b84718
commit
5edd6d52b1
|
@ -773,7 +773,7 @@
|
||||||
/* Extract standard_width from writing system/script specific */
|
/* Extract standard_width from writing system/script specific */
|
||||||
/* metrics class. */
|
/* metrics class. */
|
||||||
|
|
||||||
FT_LOCAL_DEF( void )
|
FT_CALLBACK_DEF( void )
|
||||||
af_cjk_get_standard_widths( AF_StyleMetrics metrics_, /* AF_CJKMetrics */
|
af_cjk_get_standard_widths( AF_StyleMetrics metrics_, /* AF_CJKMetrics */
|
||||||
FT_Pos* stdHW,
|
FT_Pos* stdHW,
|
||||||
FT_Pos* stdVW )
|
FT_Pos* stdVW )
|
||||||
|
|
|
@ -1506,7 +1506,7 @@
|
||||||
/* Extract standard_width from writing system/script specific */
|
/* Extract standard_width from writing system/script specific */
|
||||||
/* metrics class. */
|
/* metrics class. */
|
||||||
|
|
||||||
FT_LOCAL_DEF( void )
|
FT_CALLBACK_DEF( void )
|
||||||
af_latin_get_standard_widths( AF_StyleMetrics metrics_, /* AF_LatinMetrics */
|
af_latin_get_standard_widths( AF_StyleMetrics metrics_, /* AF_LatinMetrics */
|
||||||
FT_Pos* stdHW,
|
FT_Pos* stdHW,
|
||||||
FT_Pos* stdVW )
|
FT_Pos* stdVW )
|
||||||
|
|
|
@ -1200,8 +1200,8 @@
|
||||||
FT_Byte* charstring_base;
|
FT_Byte* charstring_base;
|
||||||
FT_ULong charstring_len;
|
FT_ULong charstring_len;
|
||||||
|
|
||||||
FT_Fixed* stack;
|
FT_Fixed* stack;
|
||||||
FT_Byte* q;
|
FT_Byte* q = NULL;
|
||||||
|
|
||||||
|
|
||||||
charstring_base = ++p;
|
charstring_base = ++p;
|
||||||
|
@ -1243,7 +1243,7 @@
|
||||||
/* converting it back to charstring number representations */
|
/* converting it back to charstring number representations */
|
||||||
/* (this is ugly, I know). */
|
/* (this is ugly, I know). */
|
||||||
/* The maximum required size is 5 bytes per stack element. */
|
/* 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 ) ) )
|
5 * ( decoder.top - decoder.stack ) ) )
|
||||||
goto Exit;
|
goto Exit;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue