shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[sfnt] Fix compiler warnings.

* src/sfnt/ttcolr.c (tt_face_load_colr, tt_face_load_colr_layers,
tt_face_colr_blend_layer): Add `NULL' initializers.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,12 @@

 2018-06-10  Werner Lemberg  <[email protected]>

+	[sfnt] Fix compiler warnings.

+

+	* src/sfnt/ttcolr.c (tt_face_load_colr, tt_face_load_colr_layers,

+	tt_face_colr_blend_layer): Add `NULL' initializers.

+

+2018-06-10  Werner Lemberg  <[email protected]>

+

 	s/FT_Palette/FT_Palette_Data/, s/palette/palette_data/.

 	* include/freetype/ftcolor.h, include/freetype/internal/tttypes.h,

--- a/src/sfnt/ttcolr.c

+++ b/src/sfnt/ttcolr.c

@@ -203,7 +203,7 @@

     if ( cpal.version == 1 )

     {

       FT_ULong    type_offset, label_offset, entry_label_offset;

-      FT_UShort*  array;

+      FT_UShort*  array = NULL;

       FT_UShort*  limit;

       FT_UShort*  q;

@@ -372,7 +372,7 @@

     Colr*      colr          = &colr_and_cpal->colr;

     BaseGlyphRecord  glyph_record;

-    FT_Glyph_Layer   layers;

+    FT_Glyph_Layer   layers = NULL;

     int              layer_idx;

     FT_Byte*         layer_record_ptr;

@@ -524,7 +524,7 @@

         FT_UInt  rows  = (FT_UInt)( y_max - y_min );

         FT_UInt  pitch = width * 4;

-        FT_Byte*  buf;

+        FT_Byte*  buf = NULL;

         FT_Byte*  p;

         FT_Byte*  q;