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

* src/base/ftmac.c (FT_New_Face_From_SFNT): s/rlen/sfnt_size/ to 

make it compile.

* include/freetype/internal/psaux.h, src/truetype/ttgload.h:
s/index/idx/ to fix compiler warnings.

* src/sfnt/ttcmap0.c (tt_face_build_cmaps): Use more `volatile' to
fix compiler warning.

* src/gzip/ftgzip.c (BUILDFIXED): Removed.
* src/gzip/inftrees.c (inflate_trees_fixed) [!BUILDFIXED]: Use
FT_UNUSED to remove compiler warning.
This commit is contained in:
Werner Lemberg 2003-06-07 05:13:22 +00:00
parent 499053c1c5
commit 756655bdf8
7 changed files with 28 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ChangeLog
View File

@ -1,3 +1,20 @@
2003-06-07 Werner Lemberg <wl@gnu.org>
* src/base/ftmac.c (FT_New_Face_From_SFNT): s/rlen/sfnt_size/ to
make it compile.
2002-06-07 Detlef Würkner <TetiSoft@apg.lahn.de>
* include/freetype/internal/psaux.h, src/truetype/ttgload.h:
s/index/idx/ to fix compiler warnings.
* src/sfnt/ttcmap0.c (tt_face_build_cmaps): Use more `volatile' to
fix compiler warning.
* src/gzip/ftgzip.c (BUILDFIXED): Removed.
* src/gzip/inftrees.c (inflate_trees_fixed) [!BUILDFIXED]: Use
FT_UNUSED to remove compiler warning.
2003-06-06 Werner Lemberg <wl@gnu.org>
* include/freetype/ftstroker.h: Renamed to...
@ -193,7 +210,7 @@
* src/pshinter/pshglob.c, src/pshinter/pshglob.h
(psh_globals_set_scale): Make it a local function.
* test/gview.c: Fix remaming ps3->ps typo.
* test/gview.c: Fix renaming ps3->ps typo.
Formatting.
2003-05-29 Werner Lemberg <wl@gnu.org>

2
include/freetype/internal/psaux.h
View File

@ -71,7 +71,7 @@ FT_BEGIN_HEADER
FT_Error
(*add)( PS_Table table,
FT_Int index,
FT_Int idx,
void* object,
FT_PtrDist length );

8
src/base/ftmac.c
View File

@ -607,10 +607,10 @@
HUnlock( sfnt );
ReleaseResource( sfnt );
is_cff = rlen > 4 && sfnt_data[0] == 'O' &&
sfnt_data[1] == 'T' &&
sfnt_data[2] == 'T' &&
sfnt_data[3] == 'O';
is_cff = sfnt_size > 4 && sfnt_data[0] == 'O' &&
sfnt_data[1] == 'T' &&
sfnt_data[2] == 'T' &&
sfnt_data[3] == 'O';
return open_face_from_buffer( library,
sfnt_data,

1
src/gzip/ftgzip.c
View File

@ -42,7 +42,6 @@
/* original ZLib. */
#define NO_DUMMY_DECL
#define BUILDFIXED /* save code size */
#define MY_ZCALLOC
#include "zlib.h"

2
src/gzip/inftrees.c
View File

@ -451,6 +451,8 @@ z_streamp z /* for memory allocation */
ZFREE(z, c);
fixed_built = 1;
}
#else
FT_UNUSED(z);
#endif
*bl = fixed_bl;
*bd = fixed_bd;

2
src/sfnt/ttcmap0.c
View File

@ -1835,7 +1835,7 @@
if ( offset && table + offset + 2 < limit )
{
FT_Byte* cmap = table + offset;
FT_UInt format = TT_PEEK_USHORT( cmap );
volatile FT_UInt format = TT_PEEK_USHORT( cmap );
const TT_CMap_Class* volatile pclazz = tt_cmap_classes;
TT_CMap_Class clazz;

4
src/truetype/ttgload.h
View File

@ -4,7 +4,7 @@
/* */
/* TrueType Glyph Loader (specification). */
/* */
/* Copyright 1996-2001, 2002 by */
/* Copyright 1996-2001, 2002, 2003 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -33,7 +33,7 @@ FT_BEGIN_HEADER
FT_LOCAL( void )
TT_Get_Metrics( TT_HoriHeader* header,
FT_UInt index,
FT_UInt idx,
FT_Short* bearing,
FT_UShort* advance );