From 07dcc10170911c6f05fcb237c61eeb869cde4399 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Wed, 21 Apr 2004 22:27:11 +0000 Subject: [PATCH] formatting, doc improvements --- ChangeLog | 22 ++++++++++++++-------- src/autofit/afmodule.c | 2 +- src/cff/cffobjs.c | 25 ++++++++++--------------- src/psaux/psobjs.c | 4 ++-- 4 files changed, 27 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 587f83ef1..5da3b0c99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,14 +1,20 @@ -2004-04-21 David Turner +2004-04-21 David Turner - * src/cff/cffobjs.c (cff_face_init): fixed a small memory leak + * src/cff/cffobjs.c (cff_face_init): Fix a small memory leak. - * src/autofit/afloader.c, src/autofit/afmodule.c, src/base/ftdebug.c: - removed compiler warnings + * src/autofit/afloader.c (af_loader_load_g), src/autofit/afmodule.c + (af_autofitter_load_glyph), src/base/ftdebug.c (FT_Trace_Get_Name): + Remove compiler warnings. - * src/autofit/aftypes.h, src/lzw/zopen.c, src/pcf/pcfdrivr.c, - src/pcf/pcfread.c, src/psaux/psobjs.c, src/type42/t42drivr.c: - changed data arrays to "const" to avoid populating the ".data" - segment + * src/autofit/aftypes.h: Undefine AF_DEBUG. + + * src/lzw/zopen.c (rmask), src/pcf/pcfdrivr.c (pcf_service_bdf, + pcf_services), src/pcf/pcfread.c (tableNames), src/psaux/psobjs.c + (ft_char_table), src/type42/t42drivr.c (t42_service_glyph_dict, + t42_service_ps_font_name): Decorate data arrays with `const' to + avoid populating the `.data' segment. + + * src/lzw/Jamfile: New file. 2004-04-20 Werner Lemberg diff --git a/src/autofit/afmodule.c b/src/autofit/afmodule.c index f266a7afe..e22ffffc6 100644 --- a/src/autofit/afmodule.c +++ b/src/autofit/afmodule.c @@ -31,7 +31,7 @@ FT_UInt glyph_index, FT_Int32 load_flags ) { - FT_UNUSED(size); + FT_UNUSED( size ); return af_loader_load_glyph( module->loader, slot->face, glyph_index, load_flags ); diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index bbe1654ee..4d23b9a79 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -503,16 +503,13 @@ char* fullp = full; char* family = root->family_name; - /* we're going to try to extract the style name from the - * full name. We need to ignore spaces and dashes during - * the search. - */ + /* We try to extract the style name from the full name. */ + /* We need to ignore spaces and dashes during the search. */ if ( full ) { while ( *fullp ) { - /* skip common characters at the start of both strings - */ + /* skip common characters at the start of both strings */ if ( *fullp == *family ) { family++; @@ -520,15 +517,14 @@ continue; } - /* ignore spaces or dashes in full name during comparison - */ + /* ignore spaces and dashes in full name during comparison */ if ( *fullp == ' ' || *fullp == '-' ) { fullp++; continue; } - /* ignore spaces and dashes in family name during comparison - */ + + /* ignore spaces and dashes in family name during comparison */ if ( *family == ' ' || *family == '-' ) { family++; @@ -537,11 +533,10 @@ if ( !*family && *fullp ) { - /* the full name begins with the same characters than the - * family name, with spaces and dashes removed. In this - * case, the remaining string in "fullp" will be used - * as the style name - */ + /* Rhe full name begins with the same characters as the */ + /* family name, with spaces and dashes removed. In this */ + /* case, the remaining string in `fullp' will be used as */ + /* the style name. */ style_name = cff_strcpy( memory, fullp ); } break; diff --git a/src/psaux/psobjs.c b/src/psaux/psobjs.c index 7087ca5ac..4d19c70a0 100644 --- a/src/psaux/psobjs.c +++ b/src/psaux/psobjs.c @@ -285,7 +285,7 @@ #if 'A' == 65 /* ASCII */ - static const char ft_char_table[128] = + static const char ft_char_table[128] = { /* 0x00 */ -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, @@ -306,7 +306,7 @@ #if 'A' == 193 /* EBCDIC */ - static const char ft_char_table[128] = + static const char ft_char_table[128] = { /* 0x80 */ -1, 10, 11, 12, 13, 14, 15, 16, 17, 18, -1, -1, -1, -1, -1, -1,