ref: 840ce58f94bafdd24a138a9f7920becb5a30695f
parent: a93f50b61150605745771e95e8f522c2cb714ff9
author: Alexei Podtelezhnikov <[email protected]>
date: Sun Oct 18 03:36:57 EDT 2020
* src/sfnt/tt{colr,cpal}.c: Fix signedness warnings from VC++.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2020-10-17 Alexei Podtelezhnikov <[email protected]>
+ * src/sfnt/tt{colr,cpal}.c: Fix signedness warnings from VC++.+
+2020-10-17 Alexei Podtelezhnikov <[email protected]>
+
* src/sfnt/sfwoff2.c (Read255UShort): Tweak types to please VC++.
2020-10-10 Werner Lemberg <[email protected]>
--- a/src/sfnt/ttcolr.c
+++ b/src/sfnt/ttcolr.c
@@ -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_
--- a/src/sfnt/ttcpal.c
+++ b/src/sfnt/ttcpal.c
@@ -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;