ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* include/freetype/internal/psaux.h (PSAux_ServiceRec): Fix 

compiler warnings.
* include/freetype/internal/t1types.h (T1_FaceRec): Use `const' for
some members.
* src/base/ftapi.c (FT_New_Memory_Stream): Fix typos.
* src/psaux/t1cmap.c (t1_cmap_std_init, t1_cmap_unicode_init): Add
cast.
(t1_cmap_{standard,expert,custom,unicode}_class_rec): Use
`FT_CALLBACK_TABLE_DEF'.
* src/psaux/t1cmap.h: Updated.
* src/sfnt/ttcmap0.c (TT_Build_CMaps): Use `ft_encoding_none'
instead of zero.
* src/type1/t1objs.c (T1_Face_Init): Use casts.
This commit is contained in:
Werner Lemberg 2002-03-28 08:07:16 +00:00
parent 94dbf7f022
commit 1305f2616d
8 changed files with 262 additions and 262 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

292
ChangeLog
View File

@ -1,30 +1,41 @@
2002-03-28 Werner Lemberg <wl@gnu.org>
* include/freetype/internal/psaux.h (PSAux_ServiceRec): Fix
compiler warnings.
* include/freetype/internal/t1types.h (T1_FaceRec): Use `const' for
some members.
* src/base/ftapi.c (FT_New_Memory_Stream): Fix typos.
* src/psaux/t1cmap.c (t1_cmap_std_init, t1_cmap_unicode_init): Add
cast.
(t1_cmap_{standard,expert,custom,unicode}_class_rec): Use
`FT_CALLBACK_TABLE_DEF'.
* src/psaux/t1cmap.h: Updated.
* src/sfnt/ttcmap0.c (TT_Build_CMaps): Use `ft_encoding_none'
instead of zero.
* src/type1/t1objs.c (T1_Face_Init): Use casts.
2002-03-26 David Turner <david@freetype.org> 2002-03-26 David Turner <david@freetype.org>
* src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c: * src/sfnt/sfdriver.c, src/sfnt/sfobjs.c, src/sfnt/ttcmap0.c:
fixed a small bug in the FT_CMaps support code Fixed a small bug in the FT_CMaps support code.
2002-03-22 David Turner <david@freetype.org> 2002-03-22 David Turner <david@freetype.org>
* src/base/ftobjs.c, src/sfnt/ttcmap0.c, src/type1/t1objs.c: * src/base/ftobjs.c, src/sfnt/ttcmap0.c, src/type1/t1objs.c:
Various fixes to make the FT_CMaps support work correctly (more
tests are still needed).
various fixes to make the FT_CMaps support work correctly * include/freetype/internal/ftobjs.h, src/sfnt/Jamfile,
(more tests are still needed) src/sfnt/rules.mk, src/sfnt/sfnt.c, src/sfnt/sfobjs.c,
src/sfnt/ttload.c, src/sfnt/ttcmap0.c, src/sfnt/ttcmap0.h: Updated
* include/freetype/internal/ftobjs.h, the SFNT charmap support to use FT_CMaps.
src/sfnt/Jamfile, src/sfnt/rules.mk,
src/sfnt/sfnt.c, src/sfnt/sfobjs.c,
src/sfnt/ttload.c, src/sfnt/ttcmap0.c, src/sfnt/ttcmap0.h:
updated the SFNT charmap support to use FT_CMaps
* include/freetype/config/ftheader.h, include/freetype/fterrors.h: * include/freetype/config/ftheader.h, include/freetype/fterrors.h:
modified "fterrors.h" to include the error definitions list found Modified "fterrors.h" to include the error definitions list found in
in "fterrdef.h" "fterrdef.h".
* include/freetype/internal/ftmemory.h, and a lot of other files !!: * include/freetype/internal/ftmemory.h, and a lot of other files:
Changed the names of memory macros. Examples:
changed the names of memory macros. Examples:
MEM_Set => FT_MEM_SET MEM_Set => FT_MEM_SET
MEM_Copy => FT_MEM_COPY MEM_Copy => FT_MEM_COPY
@ -35,136 +46,128 @@
REALLOC = >FT_REALLOC REALLOC = >FT_REALLOC
FT_NEW was introduced to allocate a new object from a _typed_ FT_NEW was introduced to allocate a new object from a _typed_
pointer.. pointer.
note that ALLOC_ARRAY and REALLOC_ARRAY have been replaced Note that ALLOC_ARRAY and REALLOC_ARRAY have been replaced by
by FT_NEW_ARRAY and FT_RENEW_ARRAY which take _typed_ pointer FT_NEW_ARRAY and FT_RENEW_ARRAY which take _typed_ pointer
arguments. arguments.
This results in _lots_ of sources being changed, but makes the This results in _lots_ of sources being changed, but makes the code
code more generic and less error-prone.. more generic and less error-prone.
* include/freetype/internal/ftstream.h, src/base/ftstream.c,
* include/freetype/internal/ftstream.h, src/cff/cffload.c, src/pcf/pcfread.c, src/sfnt/ttcmap.c,
src/base/ftstream.c, src/cff/cffload.c, src/pcf/pcfread.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c, src/sfnt/ttpost.c,
src/sfnt/ttcmap.c, src/sfnt/ttcmap0.c, src/sfnt/ttload.c, src/sfnt/ttsbit.c, src/truetype/ttgload.c, src/truetype/ttpload.c,
src/sfnt/ttpost.c, src/sfnt/ttsbit.c, src/winfonts/winfnt.c: Changed the definitions of stream macros.
src/truetype/ttgload.c, src/truetype/ttpload.c, Examples:
src/winfonts/winfnt.c:
changed the definitions of stream macros. Examples:
NEXT_Byte => FT_NEXT_BYTE NEXT_Byte => FT_NEXT_BYTE
NEXT_Short => FT_NEXT_SHORT NEXT_Short => FT_NEXT_SHORT
NEXT_UShortLE => FT_NEXT_USHORT_LE NEXT_UShortLE => FT_NEXT_USHORT_LE
READ_Short => FT_READ_SHORT READ_Short => FT_READ_SHORT
GET_Long => FT_GET_LONG GET_Long => FT_GET_LONG
etc.. etc.
also introduced the FT_PEEK_XXXX functions..
Also introduced the FT_PEEK_XXXX functions.
2002-03-21 David Turner <david@freetype.org> 2002-03-21 David Turner <david@freetype.org>
* src/base/ftobjs.c, src/pcf/pcfdriver.c, src/pcf/pcfread.c: updated * src/base/ftobjs.c, src/pcf/pcfdriver.c, src/pcf/pcfread.c: Updated
to new FT_CMap definitions to new FT_CMap definitions.
* src/psaux/t1cmap.h, src/psaux/t1cmap.c, src/type1/t1cmap.h, * src/psaux/t1cmap.h, src/psaux/t1cmap.c, src/type1/t1cmap.h,
src/type1/t1cmap.c: updating and moving the Type 1 FT_CMap support src/type1/t1cmap.c: Updating and moving the Type 1 FT_CMap support
from "src/type1" to "src/psaux" since it's going to be shared from "src/type1" to "src/psaux" since it is going to be shared by
by the Type 1 and CID font drivers.. the Type 1 and CID font drivers.
* src/psaux/Jamfile, src/psaux/psaux.c, src/psaux/psauxmod.c, * src/psaux/Jamfile, src/psaux/psaux.c, src/psaux/psauxmod.c,
src/psaux/rules.mk, include/freetype/internal/psaux.h: added support src/psaux/rules.mk, include/freetype/internal/psaux.h: Added support
for Type 1 FT_CMaps. for Type 1 FT_CMaps.
2002-03-20 David Turner <david@freetype.org> 2002-03-20 David Turner <david@freetype.org>
* src/base/ftgloadr.c (FT_GlyphLoader_CheckSubGlyphs): fixed a memory * src/base/ftgloadr.c (FT_GlyphLoader_CheckSubGlyphs): Fixed a
allocation bug that was due to un-careful renaming of the FT_SubGlyph memory allocation bug that was due to un-careful renaming of the
type.. FT_SubGlyph type.
* src/base/ftdbgmem.c (ft_mem_table_destroy): fixed a small bug that * src/base/ftdbgmem.c (ft_mem_table_destroy): Fixed a small bug that
caused the library to crash with Electric Fence when memory debugging caused the library to crash with Electric Fence when memory
is used.. debugging is used.
* renaming stream macros. Examples: * Renaming stream macros. Examples:
FILE_Skip => FT_STREAM_SKIP FILE_Skip => FT_STREAM_SKIP
FILE_Read => FT_STREAM_READ FILE_Read => FT_STREAM_READ
ACCESS_Frame => FT_FRAME_ENTER ACCESS_Frame => FT_FRAME_ENTER
FORGET_Frame => FT_FRAME_EXIT FORGET_Frame => FT_FRAME_EXIT
etc... etc.
* src/sfnt/sfdriver.c (get_sfnt_postscript_name): fixed memory leak * src/sfnt/sfdriver.c (get_sfnt_postscript_name): Fixed memory leak.
* include/freetype/internal/ftobjs.h: changing the definition of * include/freetype/internal/ftobjs.h: Changing the definition of
FT_CMap_CharNextFunc slightly FT_CMap_CharNextFunc slightly.
* src/cff/*.c: updating CFF type definitions. * src/cff/*.c: Updating CFF type definitions.
2002-03-14 David Turner <david@freetype.org> 2002-03-14 David Turner <david@freetype.org>
* include/freetype/internal/autohint.h, src/autohint/ahmodule.c, * include/freetype/internal/autohint.h, src/autohint/ahmodule.c,
src/base/ftapi.c, src/base/ftobjs.c: updating the type definitions for src/base/ftapi.c, src/base/ftobjs.c: Updating the type definitions
the auto-hinter module. for the auto-hinter module.
(i.e. FT_AutoHinter_Interface => FT_AutoHinter_ServiceRec, FT_AutoHinter_Interface => FT_AutoHinter_ServiceRec
FT_AutoHinter_Interface* => FT_AutoHinter_Service, etc..) FT_AutoHinter_Interface* => FT_AutoHinter_Service
etc.
* include/freetype/internal/cfftypes.h, src/cff/*.c: updating the * include/freetype/internal/cfftypes.h, src/cff/*.c: Updating the
type definitions of the CFF font driver type definitions of the CFF font driver.
(i.e. CFF_Font => CFF_FontRec CFF_Font => CFF_FontRec
CFF_Font* => CFF_Font, etc...) CFF_Font* => CFF_Font
etc.
* include/freetype/internal/fnttypes.h, src/winfonts/*.c: updating * include/freetype/internal/fnttypes.h, src/winfonts/*.c: Updating
the type definitions of the Windows FNT font driver type definitions of the Windows FNT font driver.
* include/freetype/internal/ftdriver.h, * include/freetype/internal/ftdriver.h,
include/freetype/internal/ftobjs.h, include/freetype/internal/ftobjs.h, src/base/ftapi.c,
src/base/ftapi.c, src/base/ftobjs.c, src/base/ftobjs.c, src/cff/cffdrivr.c, src/cff/cffdrivr.h,
src/cff/cffdrivr.c, src/cff/cffdrivr.h, src/cid/cidriver.c, src/cid/cidriver.h, src/pcf/pcfdriver.c,
src/cid/cidriver.c, src/cid/cidriver.h, src/pcf/pcfdriver.h, src/truetype/ttdriver.c,
src/pcf/pcfdriver.c, src/pcf/pcfdriver.h, src/truetype/ttdriver.h, src/type1/t1driver.c, src/type1/t1driver.h,
src/truetype/ttdriver.c, src/truetype/ttdriver.h, src/winfonts/winfnt.c, src/winfonts/winfnt.h: Updating type
src/type1/t1driver.c, src/type1/t1driver.h, definitions for font drivers.
src/winfonts/winfnt.c, src/winfonts/winfnt.h:
updating the type definitions for font font drivers
* include/freetype/internal/ftobjs.h, * include/freetype/internal/ftobjs.h, src/base/ftapi.c,
src/base/ftapi.c, src/base/ftobjs.c: updated a few face method src/base/ftobjs.c: Updated a few face method definitions:
definitions:
FT_PSName_Requester => FT_Face_GetPostscriptNameFunc FT_PSName_Requester => FT_Face_GetPostscriptNameFunc
FT_Glyph_Name_Requester => FT_Face_GetGlyphNameFunc FT_Glyph_Name_Requester => FT_Face_GetGlyphNameFunc
FT_Name_Index_Requester => FT_Face_GetGlyphNameIndexFunc FT_Name_Index_Requester => FT_Face_GetGlyphNameIndexFunc
* include/freetype/internal/psaux.h, * include/freetype/internal/psaux.h, src/cid/cidload.c,
src/cid/cidload.c, src/cidtoken.h, src/cidtoken.h, src/psaux/psobjs.c, src/psaux/psobjs.h,
src/psaux/psobjs.c, src/psaux/psobjs.h, src/psaux/t1decode.c, src/psaux/t1decode.c, stc/type1/t1load.c, src/type1/t1tokens.h:
stc/type1/t1load.c, src/type1/t1tokens.h: updated common Postscript Updated common PostScript type definitions.
type definitions
* include/freetype/internal/psglobals.h (removed), * include/freetype/internal/psglobals.h,
include/freetype/internal/pshints.h, include/freetype/internal/pshints.h, src/pshinter/pshglob.h:
src/pshinter/pshglob.h: removing obsolete file Removing obsolete files.
* include/freetype/internal/tttypes.h, * include/freetype/internal/tttypes.h,
include/freetype/internal/sfnt.h, include/freetype/internal/sfnt.h, src/base/ftnames.c,
src/base/ftnames.c, src/cff/cffdrivr.c, src/cff/cffdrivr.c, src/sfnt/*.c, src/truetype/*.c: Updated
src/sfnt/*.c, src/truetype/*.c: updated SFNT/TrueType type SFNT/TrueType type definitions.
definitions
* include/freetype/freetype.h, include/freetype/internal/ftgloadr.h: * include/freetype/freetype.h, include/freetype/internal/ftgloadr.h:
updating type defintiions for the glyph loader Updating type defintiions for the glyph loader.
2002-03-13 Antoine Leca <antoine@oriolnet.com> 2002-03-13 Antoine Leca <antoine@oriolnet.com>
* include/freetype/config/ftoption.h: changed the automatic detection * include/freetype/config/ftoption.h: Changed the automatic
of Microsoft C compilers to automatically support 64-bit integers only detection of Microsoft C compilers to automatically support 64-bit
since revision 9.00 (i.e. >= Visual C++ 2.0) integers only since revision 9.00 (i.e. >= Visual C++ 2.0).
2002-03-08 Werner Lemberg <wl@gnu.org> 2002-03-08 Werner Lemberg <wl@gnu.org>
@ -235,16 +238,19 @@
2002-03-06 David Turner <david@freetype.org> 2002-03-06 David Turner <david@freetype.org>
* src/type1/t1objs.c (T1_Face_Init), src/cid/cidobjs.c (CID_Face_Init): * src/type1/t1objs.c (T1_Face_Init), src/cid/cidobjs.c
fixed another bug related to the ascender/descender/text height of (CID_Face_Init): Fixed another bug related to the
Postscript fonts. Damn, this should have been fixed on 2002-03-04 ! ascender/descender/text height of Postscript fonts.
* src/pshinter/pshalgo2.c: changed 'print_zone' to 'psh2_print_zone' * src/pshinter/pshalgo2.c (print_zone): Renamed to ...
* src/pshinter/pshalgo1.c: changed 'print_zone' to 'psh1_print_zone' (psh2_print_zone): This.
* src/pshinter/pshalgo1.c (print_zone): Renamed to ...
(psh1_print_zone): This.
* include/freetype/freetype.h, include/freetype/internal/ftobjs.h, * include/freetype/freetype.h, include/freetype/internal/ftobjs.h,
src/base/ftobjs.c, src/base/ftinit.c: adding the new FT_Library_Version src/base/ftobjs.c, src/base/ftinit.c: Adding the new
API to return the library's current version in dynamic links. FT_Library_Version API to return the library's current version in
dynamic links.
2002-03-06 Werner Lemberg <wl@gnu.org> 2002-03-06 Werner Lemberg <wl@gnu.org>
@ -255,16 +261,14 @@
2002-03-05 David Turner <david@freetype.org> 2002-03-05 David Turner <david@freetype.org>
* src/type1/t1objs.c (T1_Face_Init), * src/type1/t1objs.c (T1_Face_Init), src/cff/cffobjs.c
src/cff/cffobjs.c (CFF_Face_Init), (CFF_Face_Init), src/cid/cidobjs.c (CID_Face_Init): Removing the bug
src/cid/cidobjs.c (CID_Face_Init): that returned global BBox values in 16.16 fixed format (instead of
integer font units).
removing the bug that returned global BBox values in * src/cid/cidriver.c (cid_get_postscript_name): Fixed a bug that
16.16 fixed format (instead of integer font units).
* src/cid/cidriver.c (cid_get_postscript_name): fixed a bug that
caused the CID driver to return Postscript font names with a leading caused the CID driver to return Postscript font names with a leading
slash ("/") as in "/MOEKai-Regular" slash ("/") as in "/MOEKai-Regular".
* src/sfnt/ttload.c (TT_Load_Names), src/sfnt/sfobjs.c (Get_Name), * src/sfnt/ttload.c (TT_Load_Names), src/sfnt/sfobjs.c (Get_Name),
src/sfnt/sfdriver.c (get_sfnt_postscript_name): Fixed the loader so src/sfnt/sfdriver.c (get_sfnt_postscript_name): Fixed the loader so
@ -275,7 +279,6 @@
Windows-encoded entries before Macintosh or Unicode ones, since it Windows-encoded entries before Macintosh or Unicode ones, since it
seems some fonts don't have reliable values here anyway. seems some fonts don't have reliable values here anyway.
2002-03-05 Werner Lemberg <wl@gnu.org> 2002-03-05 Werner Lemberg <wl@gnu.org>
* builds/unix/aclocal.m4, builds/unix/ltmain.sh: Update to libtool * builds/unix/aclocal.m4, builds/unix/ltmain.sh: Update to libtool
@ -293,24 +296,24 @@
2002-02-28 David Turner <david@freetype.org> 2002-02-28 David Turner <david@freetype.org>
* include/freetype/ftconfig.h: changed FT_LOCAL xxxx to FT_LOCAL( xxxx ) * include/freetype/ftconfig.h: Changed `FT_LOCAL xxxx' to
everywhere in the source. Sames goes for FT_LOCAL_DEF xxxx translated `FT_LOCAL( xxxx )' everywhere in the source. The same goes for
into FT_LOCAL_DEF( xxxxx ) `FT_LOCAL_DEF xxxx' translated to `FT_LOCAL_DEF( xxxxx )'.
* include/freetype/freetype.h: changing version to 2.1.0 to indicate * include/freetype/freetype.h: Changing version to 2.1.0 to indicate
an unstable branch. Added the declarations of FT_Get_First_Char and an unstable branch.
FT_Get_Next_Char Added the declarations of FT_Get_First_Char and FT_Get_Next_Char.
* src/base/ftobjs.c: implemented FT_Get_First_Char and FT_Get_Next_Char * src/base/ftobjs.c: Implement FT_Get_First_Char and
FT_Get_Next_Char.
* include/freetype/t1tables.h: re-naming structure types. This done * include/freetype/t1tables.h: Renaming structure types. This
basically:
typedef T1_Struct_ typedef T1_Struct_
{ {
} T1_Struct; } T1_Struct;
becomes: becomes
typedef PS_StructRec_ typedef PS_StructRec_
{ {
@ -318,34 +321,32 @@
typedef PS_StructRec T1_Struct; /* backwards-compatibility */ typedef PS_StructRec T1_Struct; /* backwards-compatibility */
Hence, we increase the coherency of the source code by effectively
hence, we increase the coherency of the source code by effectively using the `Rec' prefix for structure types.
using the 'Rec' prefix for structure types..
2002-02-27 David Turner <david@freetype.org> 2002-02-27 David Turner <david@freetype.org>
* src/sfnt/ttload.c (TT_Load_Names): simplifying and securing the * src/sfnt/ttload.c (TT_Load_Names): Simplifying and securing the
names table loader. Invalid individual name entries are now handled names table loader. Invalid individual name entries are now handled
correctly. This allows the loading of very buggy fonts like correctly. This allows the loading of very buggy fonts like
"foxjump.ttf" without allocating tons of memory and causing crashes.. "foxjump.ttf" without allocating tons of memory and causing crashes.
* src/otlayout/otlcommon.h, src/otlayout/otlcommon.c: adding (still * src/otlayout/otlcommon.h, src/otlayout/otlcommon.c: Adding (still
experimental) code for OpenType Layout tables validation and parsing experimental) code for OpenType Layout tables validation and
parsing.
* src/type1/t1cmap.h, src/type1/t1cmap.c: adding (still experimental) * src/type1/t1cmap.h, src/type1/t1cmap.c: Adding (still
code for Type 1 charmap processing experimental) code for Type 1 charmap processing.
* src/sfnt/ttcmap0.c: completing the experimental SFNT charmap * src/sfnt/ttcmap0.c: Completing the experimental SFNT charmap
processing processing.
* include/freetype/internal/ftobjs.h: adding validation support as
well as internal charmap object definitions (FT_CMap != FT_CharMap)
* include/freetype/internal/ftobjs.h: Adding validation support as
well as internal charmap object definitions (FT_CMap != FT_CharMap).
2002-02-24 David Turner <david@freetype.org> 2002-02-24 David Turner <david@freetype.org>
* renaming stream functions to the FT_Subject_Action scheme: * Renaming stream functions to the FT_<Subject>_<Action> scheme:
FT_Seek_Stream => FT_Stream_Seek FT_Seek_Stream => FT_Stream_Seek
FT_Skip_Stream => FT_Stream_Skip FT_Skip_Stream => FT_Stream_Skip
@ -358,39 +359,28 @@
FT_Get_XXXX => FT_Stream_Get_XXXX FT_Get_XXXX => FT_Stream_Get_XXXX
FT_Read_XXXX => FT_Stream_Read_XXXX FT_Read_XXXX => FT_Stream_Read_XXXX
note also that:
FT_New_Stream( filename, stream ) => FT_New_Stream( filename, stream ) =>
FT_Stream_Open( stream, filename ) FT_Stream_Open( stream, filename )
(the function doesn't create the FT_Stream structure, it simply (The function doesn't create the FT_Stream structure, it simply
initializes it for reading) initializes it for reading.)
FT_New_Memory_Stream( library, FT_Byte* base, size, stream ) => FT_New_Memory_Stream( library, FT_Byte* base, size, stream ) =>
FT_Stream_Open_Memory( stream, const FT_Byte* base, size ) FT_Stream_Open_Memory( stream, const FT_Byte* base, size )
FT_Done_Stream => FT_Stream_Close FT_Done_Stream => FT_Stream_Close
note that the name of the stream methods, defined in
"include/freetype/ftsystem.h" have also been changed without
problems:
FT_Stream_IO => FT_Stream_IOFunc FT_Stream_IO => FT_Stream_IOFunc
FT_Stream_Close => FT_Stream_CloseFunc FT_Stream_Close => FT_Stream_CloseFunc
* Moving all memory and list management code to "src/base/ftutil.c"
(previously in "ftobjs.c" and "ftlist.c" respectively).
* Moving all code related to glyph loaders to "internal/ftgloadr.h"
* moving all memory and list management code to "src/base/ftutil.c"
(previously in "ftobjs.c" and "ftlist.c" respectively)
* moving all code related to glyph loaders to "internal/ftgloadr.h"
and "src/base/ftgloadr.c". and "src/base/ftgloadr.c".
"FT_GlyphLoader" is now a pointer to the structure
"FT_GlyphLoaderRec".
Note also that the type "FT_GlyphLoader" is now a pointer to the * Renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP".
structure "FT_GlyphLoaderRec"..
* renaming "ft_glyph_own_bitmap" into "FT_GLYPH_OWN_BITMAP"
2002-02-22 Werner Lemberg <wl@gnu.org> 2002-02-22 Werner Lemberg <wl@gnu.org>

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

@ -681,10 +681,11 @@ FT_BEGIN_HEADER
typedef struct PSAux_ServiceRec_ typedef struct PSAux_ServiceRec_
{ {
const PS_Table_Funcs ps_table_funcs; /* don't use `PS_Table_Funcs' and friends to avoid compiler warnings */
const PS_Parser_Funcs ps_parser_funcs; const PS_Table_FuncsRec* ps_table_funcs;
const T1_Builder_Funcs t1_builder_funcs; const PS_Parser_FuncsRec* ps_parser_funcs;
const T1_Decoder_Funcs t1_decoder_funcs; const T1_Builder_FuncsRec* t1_builder_funcs;
const T1_Decoder_FuncsRec* t1_decoder_funcs;
void void
(*t1_decrypt)( FT_Byte* buffer, (*t1_decrypt)( FT_Byte* buffer,

8
include/freetype/internal/t1types.h
View File

@ -165,9 +165,9 @@ FT_BEGIN_HEADER
{ {
FT_FaceRec root; FT_FaceRec root;
T1_FontRec type1; T1_FontRec type1;
void* psnames; const void* psnames;
void* psaux; const void* psaux;
void* afm_data; const void* afm_data;
FT_CharMapRec charmaprecs[2]; FT_CharMapRec charmaprecs[2];
FT_CharMap charmaps[2]; FT_CharMap charmaps[2];
PS_Unicodes unicode_map; PS_Unicodes unicode_map;
@ -176,7 +176,7 @@ FT_BEGIN_HEADER
PS_Blend blend; PS_Blend blend;
/* since FT 2.1 - interface to PostScript hinter */ /* since FT 2.1 - interface to PostScript hinter */
void* pshinter; const void* pshinter;
} T1_FaceRec; } T1_FaceRec;

5
src/base/ftapi.c
View File

@ -39,14 +39,15 @@
/* backwards compatibility API */ /* backwards compatibility API */
FT_BASE_DEF( void ) FT_BASE_DEF( void )
FT_New_Memory_Stream( FT_Library library, FT_New_Memory_Stream( FT_Library library,
FT_Byte* base, FT_Byte* base,
FT_ULong size, FT_ULong size,
FT_Stream stream ) FT_Stream stream )
{ {
return FT_Stream_OpenMemory( library, base, size, stream ); FT_UNUSED( library );
FT_Stream_OpenMemory( stream, base, size );
} }

19
src/psaux/t1cmap.c
View File

@ -15,8 +15,8 @@
t1_cmap_std_init( T1_CMapStd cmap, t1_cmap_std_init( T1_CMapStd cmap,
FT_Int is_expert ) FT_Int is_expert )
{ {
T1_Face face = (T1_Face) FT_CMAP_FACE(cmap); T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
PSNames_Service psnames = face->psnames; PSNames_Service psnames = (PSNames_Service)face->psnames;
cmap->num_glyphs = face->type1.num_glyphs; cmap->num_glyphs = face->type1.num_glyphs;
cmap->glyph_names = (const char* const*)face->type1.glyph_names; cmap->glyph_names = (const char* const*)face->type1.glyph_names;
@ -101,7 +101,7 @@
} }
FT_LOCAL_DEF( const FT_CMap_ClassRec ) FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_standard_class_rec = t1_cmap_standard_class_rec =
{ {
sizeof( T1_CMapStdRec ), sizeof( T1_CMapStdRec ),
@ -122,7 +122,7 @@
return 0; return 0;
} }
FT_LOCAL_DEF( const FT_CMap_ClassRec ) FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_expert_class_rec = t1_cmap_expert_class_rec =
{ {
sizeof( T1_CMapStdRec ), sizeof( T1_CMapStdRec ),
@ -215,7 +215,7 @@
} }
FT_LOCAL_DEF( const FT_CMap_ClassRec ) FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_custom_class_rec = t1_cmap_custom_class_rec =
{ {
sizeof( T1_CMapCustomRec ), sizeof( T1_CMapCustomRec ),
@ -259,9 +259,10 @@
{ {
FT_Error error; FT_Error error;
FT_UInt count; FT_UInt count;
T1_Face face = (T1_Face) FT_CMAP_FACE(cmap); T1_Face face = (T1_Face)FT_CMAP_FACE( cmap );
FT_Memory memory = FT_FACE_MEMORY(face); FT_Memory memory = FT_FACE_MEMORY( face );
PSNames_Service psnames = face->psnames; PSNames_Service psnames = (PSNames_Service)face->psnames;
cmap->num_pairs = 0; cmap->num_pairs = 0;
cmap->pairs = NULL; cmap->pairs = NULL;
@ -416,7 +417,7 @@
} }
FT_LOCAL_DEF( const FT_CMap_ClassRec ) FT_CALLBACK_TABLE_DEF const FT_CMap_ClassRec
t1_cmap_unicode_class_rec = t1_cmap_unicode_class_rec =
{ {
sizeof( T1_CMapUnicodeRec ), sizeof( T1_CMapUnicodeRec ),

12
src/psaux/t1cmap.h
View File

@ -32,9 +32,11 @@ FT_BEGIN_HEADER
} T1_CMapStdRec; } T1_CMapStdRec;
FT_LOCAL( const FT_CMap_ClassRec ) t1_cmap_standard_class_rec; FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_standard_class_rec;
FT_LOCAL( const FT_CMap_ClassRec ) t1_cmap_expert_class_rec; FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_expert_class_rec;
/***************************************************************************/ /***************************************************************************/
/***************************************************************************/ /***************************************************************************/
@ -55,7 +57,8 @@ FT_BEGIN_HEADER
} T1_CMapCustomRec; } T1_CMapCustomRec;
FT_LOCAL( const FT_CMap_ClassRec ) t1_cmap_custom_class_rec; FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_custom_class_rec;
/***************************************************************************/ /***************************************************************************/
/***************************************************************************/ /***************************************************************************/
@ -85,7 +88,8 @@ FT_BEGIN_HEADER
} T1_CMapUnicodeRec; } T1_CMapUnicodeRec;
FT_LOCAL( const FT_CMap_ClassRec ) t1_cmap_unicode_class_rec; FT_CALLBACK_TABLE const FT_CMap_ClassRec
t1_cmap_unicode_class_rec;
/* */ /* */

2
src/sfnt/ttcmap0.c
View File

@ -1575,7 +1575,7 @@
charmap.platform_id = TT_NEXT_USHORT(p); charmap.platform_id = TT_NEXT_USHORT(p);
charmap.encoding_id = TT_NEXT_USHORT(p); charmap.encoding_id = TT_NEXT_USHORT(p);
charmap.face = FT_FACE(face); charmap.face = FT_FACE(face);
charmap.encoding = 0; /* will be filled later */ charmap.encoding = ft_encoding_none; /* will be filled later */
offset = TT_NEXT_ULONG(p); offset = TT_NEXT_ULONG(p);
if ( offset && table + offset + 2 < limit ) if ( offset && table + offset + 2 < limit )

15
src/type1/t1objs.c
View File

@ -290,14 +290,17 @@
face->root.num_faces = 1; face->root.num_faces = 1;
psnames = face->psnames = (PSNames_Service) face->psnames = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "psnames" ); "psnames" );
psnames = (PSNames_Service)face->psnames;
psaux = face->psaux = (PSAux_Service) face->psaux = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "psaux" ); "psaux" );
psaux = (PSAux_Service)face->psaux;
pshinter = face->pshinter = (PSHinter_Service) face->pshinter = FT_Get_Module_Interface( FT_FACE_LIBRARY( face ),
FT_Get_Module_Interface( FT_FACE_LIBRARY(face), "pshinter" ); "pshinter" );
pshinter = (PSHinter_Service)face->pshinter;
/* open the tokenizer, this will also check the font format */ /* open the tokenizer, this will also check the font format */
error = T1_Open_Face( face ); error = T1_Open_Face( face );