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

22 years ago · 3061e893ce
parent 80fff78dc6
commit 3061e893ce
4 changed files with 10 additions and 8 deletions
--- a/8
+++ b/8
@ -1,3 +1,11 @@
+2003-10-21  Josselin Mouette  <joss@debian.org>
+
+	* 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  <graham.asher@btinternet.com>

 	* src/winfonts/winfnt.c (fnt_cmap_class): Fix position of `const'.
--- a/include/freetype/internal/t1types.h
+++ b/include/freetype/internal/t1types.h
@ -109,14 +109,14 @@ FT_BEGIN_HEADER
    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;
    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