From 3061e893ce4e3ee45407a621f63358cccec43e2f Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 22 Oct 2003 20:24:47 +0000 Subject: [PATCH] * 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'. --- ChangeLog | 8 ++++++++ include/freetype/internal/t1types.h | 4 ++-- src/type1/t1objs.c | 3 --- src/type42/t42objs.c | 3 --- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 093f2df83..5b2aa8f56 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2003-10-21 Josselin Mouette + + * 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 * src/winfonts/winfnt.c (fnt_cmap_class): Fix position of `const'. diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h index c688067af..3d290d52e 100644 --- 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; diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index 94452f56c..39598852a 100644 --- 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 ) diff --git a/src/type42/t42objs.c b/src/type42/t42objs.c index c4ce3fefb..685c38023 100644 --- 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