minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

* src/autohint/ahglobal.c (blue_chars), src/winfonts/winfnt.c 

(fnt_cmap_class_rec, fnt_cmap_class), src/bdf/bdflib.c (empty,
_num_bdf_properties), src/gzip/infutil.c (inflate_mask),
src/gzip/inffixed.h (fixed_bl, fixed_bd, fixed_tl, fixed_td),
src/gzip/inftrees.h (inflate_trees_fixed), srf/gzip/inftrees.c
(inflate_trees_fixed): Decorate with more `const' to avoid
writable global variables which are disallowed on ARM.
This commit is contained in:
Werner Lemberg 2003-10-15 22:20:56 +00:00
parent 5131692505
commit 15ee9b5542
8 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,13 @@
2003-10-15: Graham Asher <graham.asher@btinternet.com>
* src/autohint/ahglobal.c (blue_chars), src/winfonts/winfnt.c
(fnt_cmap_class_rec, fnt_cmap_class), src/bdf/bdflib.c (empty,
_num_bdf_properties), src/gzip/infutil.c (inflate_mask),
src/gzip/inffixed.h (fixed_bl, fixed_bd, fixed_tl, fixed_td),
src/gzip/inftrees.h (inflate_trees_fixed), srf/gzip/inftrees.c
(inflate_trees_fixed): Decorate with more `const' to avoid
writable global variables which are disallowed on ARM.
2003-10-08 Werner Lemberg <wl@gnu.org>
* src/type1/t1load.c (parse_font_matrix, parse_charstrings): Remove
@ -41,7 +51,7 @@
(ps_parser_skip_PS_token): New function. This is a better
replacement of...
(ps_parser_skip_alpha): Removed.
(ps_parser_to_token, ps+parser_to_token_array): Updated.
(ps_parser_to_token, ps_parser_to_token_array): Updated.
(T1Radix): Rewritten, using `ft_char_table'.
(t1_toint): Renamed to...
(ps_toint): This. Update all callers.

2
src/autohint/ahglobal.c
View File

@ -30,7 +30,7 @@
/* cf. AH_BLUE_XXX constants in ahtypes.h */
static
const char* blue_chars[AH_BLUE_MAX] =
const char* const blue_chars[AH_BLUE_MAX] =
{
"THEZOCQS",
"HEZLOCUS",

8
src/bdf/bdflib.c
View File

@ -163,7 +163,7 @@
{ (char *)"_MULE_RELATIVE_COMPOSE", BDF_INTEGER, 1, { 0 } },
};
static unsigned long
static const unsigned long
_num_bdf_properties = sizeof ( _bdf_properties ) /
sizeof ( _bdf_properties[0] );
@ -391,7 +391,7 @@
/* An empty string for empty fields. */
static char empty[1] = { 0 }; /* XXX eliminate this */
static const char empty[1] = { 0 }; /* XXX eliminate this */
/* Assume the line is NULL-terminated and that the `list' parameter */
@ -468,7 +468,7 @@
}
/* Assign the field appropriately. */
list->field[list->used++] = ( ep > sp ) ? sp : empty;
list->field[list->used++] = ( ep > sp ) ? sp : (char*)empty;
sp = ep;
@ -511,7 +511,7 @@
}
if ( final_empty )
list->field[list->used++] = empty;
list->field[list->used++] = (char*)empty;
if ( list->used == list->size )
{

8
src/gzip/inffixed.h
View File

@ -7,9 +7,9 @@
subject to change. Applications should only use zlib.h.
*/
local uInt fixed_bl = 9;
local uInt fixed_bd = 5;
local inflate_huft fixed_tl[] = {
local const uInt fixed_bl = 9;
local const uInt fixed_bd = 5;
local const inflate_huft fixed_tl[] = {
{{{96,7}},256}, {{{0,8}},80}, {{{0,8}},16}, {{{84,8}},115},
{{{82,7}},31}, {{{0,8}},112}, {{{0,8}},48}, {{{0,9}},192},
{{{80,7}},10}, {{{0,8}},96}, {{{0,8}},32}, {{{0,9}},160},
@ -139,7 +139,7 @@ local inflate_huft fixed_tl[] = {
{{{82,7}},27}, {{{0,8}},111}, {{{0,8}},47}, {{{0,9}},191},
{{{0,8}},15}, {{{0,8}},143}, {{{0,8}},79}, {{{0,9}},255}
};
local inflate_huft fixed_td[] = {
local const inflate_huft fixed_td[] = {
{{{80,5}},1}, {{{87,5}},257}, {{{83,5}},17}, {{{91,5}},4097},
{{{81,5}},5}, {{{89,5}},1025}, {{{85,5}},65}, {{{93,5}},16385},
{{{80,5}},3}, {{{88,5}},513}, {{{84,5}},33}, {{{92,5}},8193},

10
src/gzip/inftrees.c
View File

@ -401,11 +401,11 @@ local inflate_huft *fixed_td;
local int inflate_trees_fixed( /* bl, bd, tl, td, z) */
uIntf *bl, /* literal desired/actual bit depth */
uIntf *bd, /* distance desired/actual bit depth */
inflate_huft * FAR *tl, /* literal/length tree result */
inflate_huft * FAR *td, /* distance tree result */
z_streamp z /* for memory allocation */
uIntf *bl, /* literal desired/actual bit depth */
uIntf *bd, /* distance desired/actual bit depth */
const inflate_huft * FAR *tl, /* literal/length tree result */
const inflate_huft * FAR *td, /* distance tree result */
z_streamp z /* for memory allocation */
)
{
#ifdef BUILDFIXED

4
src/gzip/inftrees.h
View File

@ -56,8 +56,8 @@ local int inflate_trees_dynamic OF((
local int inflate_trees_fixed OF((
uIntf *, /* literal desired/actual bit depth */
uIntf *, /* distance desired/actual bit depth */
inflate_huft * FAR *, /* literal/length tree result */
inflate_huft * FAR *, /* distance tree result */
const inflate_huft * FAR *, /* literal/length tree result */
const inflate_huft * FAR *, /* distance tree result */
z_streamp)); /* for memory allocation */
#endif /* _INFTREES_H */

2
src/gzip/infutil.c
View File

@ -11,7 +11,7 @@
/* And'ing with mask[n] masks the lower n bits */
local uInt inflate_mask[17] = {
local const uInt inflate_mask[17] = {
0x0000,
0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff

13
src/winfonts/winfnt.c
View File

@ -37,8 +37,7 @@
#define FT_COMPONENT trace_winfnt
static
const FT_Frame_Field winmz_header_fields[] =
static const FT_Frame_Field winmz_header_fields[] =
{
#undef FT_STRUCTURE
#define FT_STRUCTURE WinMZ_HeaderRec
@ -50,8 +49,7 @@
FT_FRAME_END
};
static
const FT_Frame_Field winne_header_fields[] =
static const FT_Frame_Field winne_header_fields[] =
{
#undef FT_STRUCTURE
#define FT_STRUCTURE WinNE_HeaderRec
@ -64,8 +62,7 @@
FT_FRAME_END
};
static
const FT_Frame_Field winfnt_header_fields[] =
static const FT_Frame_Field winfnt_header_fields[] =
{
#undef FT_STRUCTURE
#define FT_STRUCTURE FT_WinFNT_HeaderRec
@ -372,7 +369,7 @@
}
static FT_CMap_ClassRec fnt_cmap_class_rec =
static const FT_CMap_ClassRec fnt_cmap_class_rec =
{
sizeof ( FNT_CMapRec ),
@ -382,7 +379,7 @@
(FT_CMap_CharNextFunc) fnt_cmap_char_next
};
static FT_CMap_Class fnt_cmap_class = &fnt_cmap_class_rec;
static const FT_CMap_Class fnt_cmap_class = &fnt_cmap_class_rec;
static void