minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

* src/sfnt/tt{colr,cpal}.c: Fix signedness warnings from VC++.

This commit is contained in:
Alexei Podtelezhnikov 2020-10-18 07:36:57 -04:00
parent a93f50b611
commit 840ce58f94
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2020-10-17 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/sfnt/tt{colr,cpal}.c: Fix signedness warnings from VC++.
2020-10-17 Alexei Podtelezhnikov <apodtele@gmail.com>
* src/sfnt/sfwoff2.c (Read255UShort): Tweak types to please VC++.

6
src/sfnt/ttcolr.c
View File

@ -39,9 +39,9 @@
/* NOTE: These are the table sizes calculated through the specs. */
#define BASE_GLYPH_SIZE 6
#define LAYER_SIZE 4
#define COLR_HEADER_SIZE 14
#define BASE_GLYPH_SIZE 6U
#define LAYER_SIZE 4U
#define COLR_HEADER_SIZE 14U
typedef struct BaseGlyphRecord_

12
src/sfnt/ttcpal.c
View File

@ -39,8 +39,8 @@
/* NOTE: These are the table sizes calculated through the specs. */
#define CPAL_V0_HEADER_BASE_SIZE 12
#define COLOR_SIZE 4
#define CPAL_V0_HEADER_BASE_SIZE 12U
#define COLOR_SIZE 4U
/* all data from `CPAL' not covered in FT_Palette_Data */
@ -139,7 +139,7 @@
3U * 4 > table_size )
goto InvalidTable;
p += face->palette_data.num_palettes * 2;
p += face->palette_data.num_palettes * 2U;
type_offset = FT_NEXT_ULONG( p );
label_offset = FT_NEXT_ULONG( p );
@ -149,7 +149,7 @@
{
if ( type_offset >= table_size )
goto InvalidTable;
if ( face->palette_data.num_palettes * 2 >
if ( face->palette_data.num_palettes * 2U >
table_size - type_offset )
goto InvalidTable;
@ -170,7 +170,7 @@
{
if ( label_offset >= table_size )
goto InvalidTable;
if ( face->palette_data.num_palettes * 2 >
if ( face->palette_data.num_palettes * 2U >
table_size - label_offset )
goto InvalidTable;
@ -191,7 +191,7 @@
{
if ( entry_label_offset >= table_size )
goto InvalidTable;
if ( face->palette_data.num_palette_entries * 2 >
if ( face->palette_data.num_palette_entries * 2U >
table_size - entry_label_offset )
goto InvalidTable;