shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

* include/freetype/internal/t1types.h (T1_FontRec): `paint_type'
and `stroke_width' aren't pointers.

* src/type42/t42objs.c (T42_Face_Done), src/type1/t1objs.c
(T1_Face_Done): Don't free `paint_type' and `stroke_width'.

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

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2003-10-21  Josselin Mouette  <[email protected]>

+

+	* include/freetype/internal/t1types.h (T1_FontRec): `paint_type'

+	and `stroke_width' aren't pointers.

+

+	* src/type42/t42objs.c (T42_Face_Done), src/type1/t1objs.c

+	(T1_Face_Done): Don't free `paint_type' and `stroke_width'.

+

 2003-10-20  Graham Asher  <[email protected]>

 	* src/winfonts/winfnt.c (fnt_cmap_class): Fix position of `const'.

--- a/include/freetype/internal/t1types.h

+++ b/include/freetype/internal/t1types.h

@@ -109,7 +109,7 @@

     FT_Byte**        charstrings;       /* array of glyph charstrings */

     FT_Int*          charstrings_len;

-    FT_Byte*         paint_type;

+    FT_Byte          paint_type;

     FT_Byte          font_type;

     FT_Matrix        font_matrix;

     FT_Vector        font_offset;

@@ -116,7 +116,7 @@

     FT_BBox          font_bbox;

     FT_Long          font_id;

-    FT_Fixed*        stroke_width;

+    FT_Fixed         stroke_width;

   } T1_FontRec, *T1_Font;

--- a/src/type1/t1objs.c

+++ b/src/type1/t1objs.c

@@ -229,9 +229,6 @@

       FT_FREE( type1->encoding.char_name );

       FT_FREE( type1->font_name );

-      FT_FREE( type1->paint_type );

-      FT_FREE( type1->stroke_width );

-

 #ifndef T1_CONFIG_OPTION_NO_AFM

       /* release afm data if present */

       if ( face->afm_data )

--- a/src/type42/t42objs.c

+++ b/src/type42/t42objs.c

@@ -401,9 +401,6 @@

       FT_FREE( type1->encoding.char_name );

       FT_FREE( type1->font_name );

-      FT_FREE( type1->paint_type );

-      FT_FREE( type1->stroke_width );

-

       FT_FREE( face->ttf_data );

 #if 0