* src/base/ftcalc.c (FT_SqrtFixed), src/base/ftobjs.c

(FT_Set_Renderer): Use FT_EXPORT_DEF.
* src/cache/ftcimage.c (FTC_Image_Cache_Lookup),
src/cache/ftcmanag.c (FTC_Manager_Done, FTC_Manager_Reset,
FTC_Manager_Lookup_Face, FTC_Manager_Lookup_Size,
FTC_Manager_Register_Cache), src/cache/ftcsbits.c
(FTC_SBit_Cache_Lookup): Ditto.

* src/include/freetype/cache/ftcglyph.h (FTC_GlyphNode_Init),
src/include/freetype/ftmac.h (FT_New_Face_From_FOND): Use FT_EXPORT.
This commit is contained in:
Werner Lemberg 2000-11-29 17:48:57 +00:00
parent f1ca234473
commit ada9503d22
8 changed files with 47 additions and 36 deletions

View File

@ -1,3 +1,16 @@
2000-11-29 Werner Lemberg <wl@gnu.org>
* src/base/ftcalc.c (FT_SqrtFixed), src/base/ftobjs.c
(FT_Set_Renderer): Use FT_EXPORT_DEF.
* src/cache/ftcimage.c (FTC_Image_Cache_Lookup),
src/cache/ftcmanag.c (FTC_Manager_Done, FTC_Manager_Reset,
FTC_Manager_Lookup_Face, FTC_Manager_Lookup_Size,
FTC_Manager_Register_Cache), src/cache/ftcsbits.c
(FTC_SBit_Cache_Lookup): Ditto.
* src/include/freetype/cache/ftcglyph.h (FTC_GlyphNode_Init),
src/include/freetype/ftmac.h (FT_New_Face_From_FOND): Use FT_EXPORT.
2000-11-29 Werner Lemberg <wl@gnu.org> 2000-11-29 Werner Lemberg <wl@gnu.org>
* src/sfnt/sfdriver.c: Include ttsbit.h and ttpost.h only * src/sfnt/sfdriver.c: Include ttsbit.h and ttpost.h only

View File

@ -167,9 +167,9 @@
/* cache sub-system internals. */ /* cache sub-system internals. */
/* */ /* */
FT_EXPORT_DEF( void ) FTC_GlyphNode_Init( FTC_GlyphNode node, FT_EXPORT( void ) FTC_GlyphNode_Init( FTC_GlyphNode node,
FTC_GlyphSet gset, FTC_GlyphSet gset,
FT_UInt gindex ); FT_UInt gindex );
#define FTC_GlyphNode_Ref( n ) \ #define FTC_GlyphNode_Ref( n ) \
FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++ FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++

View File

@ -64,11 +64,10 @@
/* fond = GetResource( 'FOND', fontName ); */ /* fond = GetResource( 'FOND', fontName ); */
/* error = FT_New_Face_From_FOND( library, fond, 0, &face ); */ /* error = FT_New_Face_From_FOND( library, fond, 0, &face ); */
/* */ /* */
FT_EXPORT_DEF( FT_Error ) FT_New_Face_From_FOND( FT_EXPORT( FT_Error ) FT_New_Face_From_FOND( FT_Library library,
FT_Library library, Handle fond,
Handle fond, FT_Long face_index,
FT_Long face_index, FT_Face *aface );
FT_Face *aface );
#ifdef __cplusplus #ifdef __cplusplus

View File

@ -200,9 +200,8 @@
} }
FT_EXPORT( FT_Int32 ) FT_SqrtFixed( FT_Int32 x ) FT_EXPORT_DEF( FT_Int32 ) FT_SqrtFixed( FT_Int32 x )
{ {
FT_Int64 z; FT_Int64 z;
@ -523,7 +522,7 @@
} }
FT_EXPORT( FT_Int32 ) FT_SqrtFixed( FT_Int32 x ) FT_EXPORT_DEF( FT_Int32 ) FT_SqrtFixed( FT_Int32 x )
{ {
FT_Int64 z; FT_Int64 z;

View File

@ -2034,10 +2034,10 @@
/* documentation is in ftrender.h */ /* documentation is in ftrender.h */
FT_EXPORT( FT_Error ) FT_Set_Renderer( FT_Library library, FT_EXPORT_DEF( FT_Error ) FT_Set_Renderer( FT_Library library,
FT_Renderer renderer, FT_Renderer renderer,
FT_UInt num_params, FT_UInt num_params,
FT_Parameter* parameters ) FT_Parameter* parameters )
{ {
FT_ListNode node; FT_ListNode node;
FT_Error error = FT_Err_Ok; FT_Error error = FT_Err_Ok;

View File

@ -271,10 +271,10 @@
} }
FT_EXPORT( FT_Error ) FTC_Image_Cache_Lookup( FTC_Image_Cache cache, FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_Lookup( FTC_Image_Cache cache,
FTC_Image_Desc* desc, FTC_Image_Desc* desc,
FT_UInt gindex, FT_UInt gindex,
FT_Glyph *aglyph ) FT_Glyph *aglyph )
{ {
FT_Error error; FT_Error error;
FTC_GlyphNode node; FTC_GlyphNode node;

26
src/cache/ftcmanag.c vendored
View File

@ -273,7 +273,7 @@
} }
FT_EXPORT( void ) FTC_Manager_Done( FTC_Manager manager ) FT_EXPORT_DEF( void ) FTC_Manager_Done( FTC_Manager manager )
{ {
FT_Memory memory; FT_Memory memory;
FT_UInt index; FT_UInt index;
@ -306,7 +306,7 @@
} }
FT_EXPORT( void ) FTC_Manager_Reset( FTC_Manager manager ) FT_EXPORT_DEF( void ) FTC_Manager_Reset( FTC_Manager manager )
{ {
if (manager ) if (manager )
{ {
@ -317,9 +317,9 @@
} }
FT_EXPORT( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager, FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager,
FTC_FaceID face_id, FTC_FaceID face_id,
FT_Face *aface ) FT_Face *aface )
{ {
if ( !manager ) if ( !manager )
return FT_Err_Invalid_Cache_Handle; return FT_Err_Invalid_Cache_Handle;
@ -330,10 +330,10 @@
} }
FT_EXPORT( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager, FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager,
FTC_Font font, FTC_Font font,
FT_Face *aface, FT_Face *aface,
FT_Size *asize ) FT_Size *asize )
{ {
FTC_FontRequest req; FTC_FontRequest req;
FT_Error error; FT_Error error;
@ -425,10 +425,10 @@
} }
FT_EXPORT( FT_Error ) FTC_Manager_Register_Cache( FT_EXPORT_DEF( FT_Error ) FTC_Manager_Register_Cache(
FTC_Manager manager, FTC_Manager manager,
FTC_Cache_Class* clazz, FTC_Cache_Class* clazz,
FTC_Cache *acache ) FTC_Cache *acache )
{ {
FT_Error error = FT_Err_Invalid_Argument; FT_Error error = FT_Err_Invalid_Argument;

View File

@ -364,10 +364,10 @@
} }
FT_EXPORT( FT_Error ) FTC_SBit_Cache_Lookup( FTC_SBit_Cache cache, FT_EXPORT_DEF( FT_Error ) FTC_SBit_Cache_Lookup( FTC_SBit_Cache cache,
FTC_Image_Desc* desc, FTC_Image_Desc* desc,
FT_UInt gindex, FT_UInt gindex,
FTC_SBit *ansbit ) FTC_SBit *ansbit )
{ {
FT_Error error; FT_Error error;
FTC_ChunkNode node; FTC_ChunkNode node;