diff --git a/builds/unix/ft2unix.h b/builds/unix/ft2unix.h index accdb2b24..c4299c3ab 100644 --- a/builds/unix/ft2unix.h +++ b/builds/unix/ft2unix.h @@ -4,7 +4,7 @@ /* */ /* Build macros of the FreeType 2 library. */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/builds/unix/ftsystem.c b/builds/unix/ftsystem.c index d684dda3b..a11287712 100644 --- a/builds/unix/ftsystem.c +++ b/builds/unix/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* Unix-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/builds/vms/ftconfig.h b/builds/vms/ftconfig.h index 6183bd726..60a93b7bb 100644 --- a/builds/vms/ftconfig.h +++ b/builds/vms/ftconfig.h @@ -4,7 +4,7 @@ /* */ /* VMS-specific configuration file (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/builds/vms/ftsystem.c b/builds/vms/ftsystem.c index d684dda3b..a11287712 100644 --- a/builds/vms/ftsystem.c +++ b/builds/vms/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* Unix-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/cache/ftcchunk.h b/include/freetype/cache/ftcchunk.h index f5ed7eba3..47fed6efa 100644 --- a/include/freetype/cache/ftcchunk.h +++ b/include/freetype/cache/ftcchunk.h @@ -4,7 +4,7 @@ /* */ /* FreeType chunk cache (specification). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -83,25 +83,32 @@ FT_BEGIN_HEADER /* */ /* used to set "element_max", "element_count" and "element_size" */ - typedef FT_Error (*FTC_ChunkSet_SizesFunc) ( FTC_ChunkSet cset, - FT_Pointer type ); + typedef FT_Error + (*FTC_ChunkSet_SizesFunc)( FTC_ChunkSet cset, + FT_Pointer type ); - typedef FT_Error (*FTC_ChunkSet_InitFunc) ( FTC_ChunkSet cset, - FT_Pointer type ); + typedef FT_Error + (*FTC_ChunkSet_InitFunc)( FTC_ChunkSet cset, + FT_Pointer type ); - typedef void (*FTC_ChunkSet_DoneFunc) ( FTC_ChunkSet cset ); + typedef void + (*FTC_ChunkSet_DoneFunc)( FTC_ChunkSet cset ); - typedef FT_Bool (*FTC_ChunkSet_CompareFunc)( FTC_ChunkSet cset, - FT_Pointer type ); + typedef FT_Bool + (*FTC_ChunkSet_CompareFunc)( FTC_ChunkSet cset, + FT_Pointer type ); - typedef FT_Error (*FTC_ChunkSet_NewNodeFunc) ( FTC_ChunkSet cset, - FT_UInt index, - FTC_ChunkNode* anode ); + typedef FT_Error + (*FTC_ChunkSet_NewNodeFunc)( FTC_ChunkSet cset, + FT_UInt index, + FTC_ChunkNode* anode ); - typedef void (*FTC_ChunkSet_DestroyNodeFunc)( FTC_ChunkNode node ); + typedef void + (*FTC_ChunkSet_DestroyNodeFunc)( FTC_ChunkNode node ); - typedef FT_ULong (*FTC_ChunkSet_SizeNodeFunc) ( FTC_ChunkNode node ); + typedef FT_ULong + (*FTC_ChunkSet_SizeNodeFunc)( FTC_ChunkNode node ); typedef struct FTC_ChunkSet_Class_ @@ -165,10 +172,11 @@ FT_BEGIN_HEADER /* cache sub-system internals. */ /* */ - FT_EXPORT( FT_Error ) FTC_ChunkNode_Init( FTC_ChunkNode node, - FTC_ChunkSet cset, - FT_UInt index, - FT_Bool alloc ); + FT_EXPORT( FT_Error ) + FTC_ChunkNode_Init( FTC_ChunkNode node, + FTC_ChunkSet cset, + FT_UInt index, + FT_Bool alloc ); #define FTC_ChunkNode_Ref( n ) \ FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++ @@ -179,32 +187,37 @@ FT_BEGIN_HEADER /* chunk set objects */ - FT_EXPORT( void ) FTC_ChunkNode_Destroy( FTC_ChunkNode node ); + FT_EXPORT( void ) + FTC_ChunkNode_Destroy( FTC_ChunkNode node ); - FT_EXPORT( FT_Error ) FTC_ChunkSet_New ( FTC_Chunk_Cache cache, - FT_Pointer type, - FTC_ChunkSet *aset ); + FT_EXPORT( FT_Error ) + FTC_ChunkSet_New( FTC_Chunk_Cache cache, + FT_Pointer type, + FTC_ChunkSet *aset ); - FT_EXPORT( FT_Error ) FTC_ChunkSet_Lookup_Node( - FTC_ChunkSet cset, - FT_UInt glyph_index, - FTC_ChunkNode* anode, - FT_UInt *anindex ); + FT_EXPORT( FT_Error ) + FTC_ChunkSet_Lookup_Node( FTC_ChunkSet cset, + FT_UInt glyph_index, + FTC_ChunkNode* anode, + FT_UInt *anindex ); /* chunk cache objects */ - FT_EXPORT( FT_Error ) FTC_Chunk_Cache_Init ( FTC_Chunk_Cache cache ); + FT_EXPORT( FT_Error ) + FTC_Chunk_Cache_Init( FTC_Chunk_Cache cache ); - FT_EXPORT( void ) FTC_Chunk_Cache_Done ( FTC_Chunk_Cache cache ); + FT_EXPORT( void ) + FTC_Chunk_Cache_Done( FTC_Chunk_Cache cache ); - FT_EXPORT( FT_Error ) FTC_Chunk_Cache_Lookup( FTC_Chunk_Cache cache, - FT_Pointer type, - FT_UInt gindex, - FTC_ChunkNode *anode, - FT_UInt *aindex ); + FT_EXPORT( FT_Error ) + FTC_Chunk_Cache_Lookup( FTC_Chunk_Cache cache, + FT_Pointer type, + FT_UInt gindex, + FTC_ChunkNode *anode, + FT_UInt *aindex ); FT_END_HEADER diff --git a/include/freetype/cache/ftcglyph.h b/include/freetype/cache/ftcglyph.h index 93aac63da..a8af44a2d 100644 --- a/include/freetype/cache/ftcglyph.h +++ b/include/freetype/cache/ftcglyph.h @@ -4,7 +4,7 @@ /* */ /* FreeType abstract glyph cache (specification). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -93,24 +93,30 @@ FT_BEGIN_HEADER /* Glyph set methods. */ /* */ - typedef FT_Error (*FTC_GlyphSet_InitFunc) ( FTC_GlyphSet gset, - FT_Pointer type ); + typedef FT_Error + (*FTC_GlyphSet_InitFunc)( FTC_GlyphSet gset, + FT_Pointer type ); - typedef void (*FTC_GlyphSet_DoneFunc) ( FTC_GlyphSet gset ); + typedef void + (*FTC_GlyphSet_DoneFunc)( FTC_GlyphSet gset ); - typedef FT_Bool (*FTC_GlyphSet_CompareFunc) ( FTC_GlyphSet gset, - FT_Pointer type ); + typedef FT_Bool + (*FTC_GlyphSet_CompareFunc)( FTC_GlyphSet gset, + FT_Pointer type ); - typedef FT_Error (*FTC_GlyphSet_NewNodeFunc) ( FTC_GlyphSet gset, - FT_UInt gindex, - FTC_GlyphNode* anode ); + typedef FT_Error + (*FTC_GlyphSet_NewNodeFunc)( FTC_GlyphSet gset, + FT_UInt gindex, + FTC_GlyphNode* anode ); - typedef void (*FTC_GlyphSet_DestroyNodeFunc)( FTC_GlyphNode node, - FTC_GlyphSet gset ); + typedef void + (*FTC_GlyphSet_DestroyNodeFunc)( FTC_GlyphNode node, + FTC_GlyphSet gset ); - typedef FT_ULong (*FTC_GlyphSet_SizeNodeFunc) ( FTC_GlyphNode node, - FTC_GlyphSet gset ); + typedef FT_ULong + (*FTC_GlyphSet_SizeNodeFunc)( FTC_GlyphNode node, + FTC_GlyphSet gset ); typedef struct FTC_GlyphSet_Class_ @@ -168,9 +174,10 @@ FT_BEGIN_HEADER /* cache sub-system internals. */ /* */ - FT_EXPORT( void ) FTC_GlyphNode_Init( FTC_GlyphNode node, - FTC_GlyphSet gset, - FT_UInt gindex ); + FT_EXPORT( void ) + FTC_GlyphNode_Init( FTC_GlyphNode node, + FTC_GlyphSet gset, + FT_UInt gindex ); #define FTC_GlyphNode_Ref( n ) \ FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count++ @@ -179,27 +186,32 @@ FT_BEGIN_HEADER FTC_CACHENODE_TO_DATA_P( &(n)->root )->ref_count-- - FT_EXPORT( void ) FTC_GlyphNode_Destroy( FTC_GlyphNode node, - FTC_Glyph_Cache cache ); + FT_EXPORT( void ) + FTC_GlyphNode_Destroy( FTC_GlyphNode node, + FTC_Glyph_Cache cache ); - FT_EXPORT( FT_Error ) FTC_Glyph_Cache_Init( FTC_Glyph_Cache cache ); + FT_EXPORT( FT_Error ) + FTC_Glyph_Cache_Init( FTC_Glyph_Cache cache ); - FT_EXPORT( void ) FTC_Glyph_Cache_Done( FTC_Glyph_Cache cache ); + FT_EXPORT( void ) + FTC_Glyph_Cache_Done( FTC_Glyph_Cache cache ); - FT_EXPORT( FT_Error ) FTC_GlyphSet_New( FTC_Glyph_Cache cache, - FT_Pointer type, - FTC_GlyphSet *aset ); + FT_EXPORT( FT_Error ) + FTC_GlyphSet_New( FTC_Glyph_Cache cache, + FT_Pointer type, + FTC_GlyphSet *aset ); - FT_EXPORT( FT_Error ) FTC_GlyphSet_Lookup_Node( - FTC_GlyphSet gset, - FT_UInt glyph_index, - FTC_GlyphNode *anode ); + FT_EXPORT( FT_Error ) + FTC_GlyphSet_Lookup_Node( FTC_GlyphSet gset, + FT_UInt glyph_index, + FTC_GlyphNode *anode ); - FT_EXPORT( FT_Error ) FTC_Glyph_Cache_Lookup( FTC_Glyph_Cache cache, - FT_Pointer type, - FT_UInt gindex, - FTC_GlyphNode *anode ); + FT_EXPORT( FT_Error ) + FTC_Glyph_Cache_Lookup( FTC_Glyph_Cache cache, + FT_Pointer type, + FT_UInt gindex, + FTC_GlyphNode *anode ); FT_END_HEADER diff --git a/include/freetype/cache/ftcimage.h b/include/freetype/cache/ftcimage.h index 2746db529..376aeab66 100644 --- a/include/freetype/cache/ftcimage.h +++ b/include/freetype/cache/ftcimage.h @@ -4,7 +4,7 @@ /* */ /* FreeType Image cache (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -42,7 +42,7 @@ FT_BEGIN_HEADER /* */ /*************************************************************************/ - + /*************************************************************************/ /*************************************************************************/ /*************************************************************************/ @@ -127,8 +127,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FTC_Image_Cache_New( FTC_Manager manager, - FTC_Image_Cache *acache ); + FT_EXPORT( FT_Error ) + FTC_Image_Cache_New( FTC_Manager manager, + FTC_Image_Cache *acache ); /*************************************************************************/ @@ -162,10 +163,11 @@ FT_BEGIN_HEADER /* taken by the glyphs it holds, the returned glyph might disappear */ /* on a later invocation of this function! It's a cache after all... */ /* */ - FT_EXPORT( FT_Error ) FTC_Image_Cache_Lookup( FTC_Image_Cache cache, - FTC_Image_Desc* desc, - FT_UInt gindex, - FT_Glyph *aglyph ); + FT_EXPORT( FT_Error ) + FTC_Image_Cache_Lookup( FTC_Image_Cache cache, + FTC_Image_Desc* desc, + FT_UInt gindex, + FT_Glyph *aglyph ); /* */ diff --git a/include/freetype/cache/ftcmanag.h b/include/freetype/cache/ftcmanag.h index fc6d5bc82..2d97fad3a 100644 --- a/include/freetype/cache/ftcmanag.h +++ b/include/freetype/cache/ftcmanag.h @@ -4,7 +4,7 @@ /* */ /* FreeType Cache Manager (specification). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -161,7 +161,8 @@ FT_BEGIN_HEADER /* The reason this function is exported is to allow client-specific */ /* cache classes. */ /* */ - FT_EXPORT( void ) FTC_Manager_Compress( FTC_Manager manager ); + FT_EXPORT( void ) + FTC_Manager_Compress( FTC_Manager manager ); /*************************************************************************/ @@ -223,8 +224,9 @@ FT_BEGIN_HEADER /* */ /* The size of a given cache node in bytes. */ /* */ - typedef FT_ULong (*FTC_CacheNode_SizeFunc)( FTC_CacheNode node, - FT_Pointer cache_data ); + typedef FT_ULong + (*FTC_CacheNode_SizeFunc)( FTC_CacheNode node, + FT_Pointer cache_data ); /*************************************************************************/ @@ -242,8 +244,9 @@ FT_BEGIN_HEADER /* */ /* cache_data :: A generic pointer passed to the destructor. */ /* */ - typedef void (*FTC_CacheNode_DestroyFunc)( FTC_CacheNode node, - FT_Pointer cache_data ); + typedef void + (*FTC_CacheNode_DestroyFunc)( FTC_CacheNode node, + FT_Pointer cache_data ); /*************************************************************************/ @@ -293,7 +296,8 @@ FT_BEGIN_HEADER /* */ /* cache :: A handle to the new cache. */ /* */ - typedef FT_Error (*FTC_Cache_InitFunc)( FTC_Cache cache ); + typedef FT_Error + (*FTC_Cache_InitFunc)( FTC_Cache cache ); /*************************************************************************/ @@ -307,7 +311,8 @@ FT_BEGIN_HEADER /* */ /* cache :: A handle to the target cache. */ /* */ - typedef void (*FTC_Cache_DoneFunc)( FTC_Cache cache ); + typedef void + (*FTC_Cache_DoneFunc)( FTC_Cache cache ); /*************************************************************************/ diff --git a/include/freetype/cache/ftcsbits.h b/include/freetype/cache/ftcsbits.h index a5555d965..aba87c8e6 100644 --- a/include/freetype/cache/ftcsbits.h +++ b/include/freetype/cache/ftcsbits.h @@ -4,7 +4,7 @@ /* */ /* A small-bitmap cache (specification). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -130,8 +130,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FTC_SBit_Cache_New( FTC_Manager manager, - FTC_SBit_Cache *acache ); + FT_EXPORT( FT_Error ) + FTC_SBit_Cache_New( FTC_Manager manager, + FTC_SBit_Cache *acache ); /*************************************************************************/ @@ -162,10 +163,11 @@ FT_BEGIN_HEADER /* The descriptor's `buffer' field is set to 0 to indicate a missing */ /* glyph bitmap. */ /* */ - FT_EXPORT( FT_Error ) FTC_SBit_Cache_Lookup( FTC_SBit_Cache cache, - FTC_Image_Desc* desc, - FT_UInt gindex, - FTC_SBit *sbit ); + FT_EXPORT( FT_Error ) + FTC_SBit_Cache_Lookup( FTC_SBit_Cache cache, + FTC_Image_Desc* desc, + FT_UInt gindex, + FTC_SBit *sbit ); /* */ diff --git a/include/freetype/cache/ftlru.h b/include/freetype/cache/ftlru.h index a7d058782..787443879 100644 --- a/include/freetype/cache/ftlru.h +++ b/include/freetype/cache/ftlru.h @@ -4,7 +4,7 @@ /* */ /* Simple LRU list-cache (specification). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -89,26 +89,30 @@ FT_BEGIN_HEADER FT_UInt lru_size; /* object size in bytes */ /* this method is used to initialize a new list element node */ - FT_Error (*init_element)( FT_Lru lru, - FT_LruNode node ); + FT_Error + (*init_element)( FT_Lru lru, + FT_LruNode node ); /* this method is used to finalize a given list element node */ - void (*done_element)( FT_Lru lru, - FT_LruNode node ); + void + (*done_element)( FT_Lru lru, + FT_LruNode node ); /* If defined, this method is called when the list if full */ /* during the lookup process -- it is used to change the contents */ /* of a list element node, instead of calling `done_element()', */ /* then `init_element'. Set it to 0 for default behaviour. */ - FT_Error (*flush_element)( FT_Lru lru, - FT_LruNode node, - FT_LruKey new_key ); + FT_Error + (*flush_element)( FT_Lru lru, + FT_LruNode node, + FT_LruKey new_key ); /* If defined, this method is used to compare a list element node */ /* with a given key during a lookup. If set to 0, the `key' */ /* fields will be directly compared instead. */ - FT_Bool (*compare_element)( FT_LruNode node, - FT_LruKey key ); + FT_Bool + (*compare_element)( FT_LruNode node, + FT_LruKey key ); } FT_Lru_Class; @@ -117,9 +121,10 @@ FT_BEGIN_HEADER /* is part of a selection for FT_Lru_Remove_Selection(). The function */ /* must return true (i.e., non-null) to indicate that the node is part */ /* of it. */ - typedef FT_Bool (*FT_Lru_Selector)( FT_Lru lru, - FT_LruNode node, - FT_Pointer data ); + typedef FT_Bool + (*FT_Lru_Selector)( FT_Lru lru, + FT_LruNode node, + FT_Pointer data ); typedef struct FT_LruRec_ @@ -138,31 +143,38 @@ FT_BEGIN_HEADER } FT_LruRec; - FT_EXPORT( FT_Error ) FT_Lru_New( const FT_Lru_Class* clazz, - FT_UInt max_elements, - FT_Pointer user_data, - FT_Memory memory, - FT_Bool pre_alloc, - FT_Lru *anlru ); + FT_EXPORT( FT_Error ) + FT_Lru_New( const FT_Lru_Class* clazz, + FT_UInt max_elements, + FT_Pointer user_data, + FT_Memory memory, + FT_Bool pre_alloc, + FT_Lru *anlru ); - FT_EXPORT( void ) FT_Lru_Reset( FT_Lru lru ); + FT_EXPORT( void ) + FT_Lru_Reset( FT_Lru lru ); - FT_EXPORT( void ) FT_Lru_Done ( FT_Lru lru ); + FT_EXPORT( void ) + FT_Lru_Done ( FT_Lru lru ); - FT_EXPORT( FT_Error ) FT_Lru_Lookup_Node( FT_Lru lru, - FT_LruKey key, - FT_LruNode *anode ); + FT_EXPORT( FT_Error ) + FT_Lru_Lookup_Node( FT_Lru lru, + FT_LruKey key, + FT_LruNode *anode ); - FT_EXPORT( FT_Error ) FT_Lru_Lookup( FT_Lru lru, - FT_LruKey key, - FT_Pointer *anobject ); + FT_EXPORT( FT_Error ) + FT_Lru_Lookup( FT_Lru lru, + FT_LruKey key, + FT_Pointer *anobject ); - FT_EXPORT( void ) FT_Lru_Remove_Node( FT_Lru lru, - FT_LruNode node ); - - FT_EXPORT( void ) FT_Lru_Remove_Selection( FT_Lru lru, - FT_Lru_Selector selector, - FT_Pointer data ); + FT_EXPORT( void ) + FT_Lru_Remove_Node( FT_Lru lru, + FT_LruNode node ); + + FT_EXPORT( void ) + FT_Lru_Remove_Selection( FT_Lru lru, + FT_Lru_Selector selector, + FT_Pointer data ); FT_END_HEADER diff --git a/include/freetype/config/ftconfig.h b/include/freetype/config/ftconfig.h index 3fa8d3f28..f990c90be 100644 --- a/include/freetype/config/ftconfig.h +++ b/include/freetype/config/ftconfig.h @@ -4,7 +4,7 @@ /* */ /* ANSI-specific configuration file (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -137,7 +137,7 @@ FT_BEGIN_HEADER typedef long FT_Fast; typedef unsigned long FT_UFast; - + #endif diff --git a/include/freetype/config/ftheader.h b/include/freetype/config/ftheader.h index 01a0f656f..fc1e6bfe9 100644 --- a/include/freetype/config/ftheader.h +++ b/include/freetype/config/ftheader.h @@ -4,7 +4,7 @@ /* */ /* Build macros of the FreeType 2 library. */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/config/ftoption.h b/include/freetype/config/ftoption.h index b0892bcf0..8150cfded 100644 --- a/include/freetype/config/ftoption.h +++ b/include/freetype/config/ftoption.h @@ -4,7 +4,7 @@ /* */ /* User-selectable configuration macros (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h index d2ddd608d..0fafb295e 100644 --- a/include/freetype/freetype.h +++ b/include/freetype/freetype.h @@ -4,7 +4,7 @@ /* */ /* FreeType high-level API and common types (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -147,10 +147,10 @@ FT_BEGIN_HEADER /* */ /* FT_CharMapRec */ /* FT_Select_Charmap */ - /* FT_Set_Charmap */ + /* FT_Set_Charmap */ /* */ /*************************************************************************/ - + /*************************************************************************/ /* */ @@ -1014,7 +1014,7 @@ FT_BEGIN_HEADER /* */ typedef struct FT_Size_InternalRec_* FT_Size_Internal; - + /*************************************************************************/ /* */ /* FreeType base size metrics */ @@ -1112,7 +1112,7 @@ FT_BEGIN_HEADER FT_Generic generic; /* generic pointer for client uses */ FT_Size_Metrics metrics; /* size metrics */ FT_Size_Internal internal; - + } FT_SizeRec; @@ -2377,7 +2377,7 @@ FT_BEGIN_HEADER /* FT_DivFix */ /* FT_RoundFix */ /* FT_CeilFix */ - /* FT_FloorFix */ + /* FT_FloorFix */ /* FT_Vector_Transform */ /* FT_Matrix_Multiply */ /* FT_Matrix_Invert */ diff --git a/include/freetype/ftbbox.h b/include/freetype/ftbbox.h index a7d0df2ed..e6616135a 100644 --- a/include/freetype/ftbbox.h +++ b/include/freetype/ftbbox.h @@ -4,7 +4,7 @@ /* */ /* FreeType exact bbox computation (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/ftcache.h b/include/freetype/ftcache.h index 43fffe7d1..fc15956f8 100644 --- a/include/freetype/ftcache.h +++ b/include/freetype/ftcache.h @@ -4,7 +4,7 @@ /* */ /* FreeType Cache subsystem. */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/ftchapters.h b/include/freetype/ftchapters.h index af4ac1a97..fcb88cda1 100644 --- a/include/freetype/ftchapters.h +++ b/include/freetype/ftchapters.h @@ -33,7 +33,7 @@ /* */ /* cache_subsystem */ /* */ -/***************************************************************************/ +/***************************************************************************/ /***************************************************************************/ diff --git a/include/freetype/fterrors.h b/include/freetype/fterrors.h index df18c79e0..85183749c 100644 --- a/include/freetype/fterrors.h +++ b/include/freetype/fterrors.h @@ -4,7 +4,7 @@ /* */ /* FreeType error codes (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -103,7 +103,7 @@ /*******************************************************************/ /*******************************************************************/ - + #undef FT_NEED_EXTERN_C #define FT_ERR_XCAT( x, y ) x ## y #define FT_ERR_CAT( x, y ) FT_ERR_XCAT( x, y ) diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h index 747cea1ab..f9666539d 100644 --- a/include/freetype/ftglyph.h +++ b/include/freetype/ftglyph.h @@ -4,7 +4,7 @@ /* */ /* FreeType convenience functions to handle glyphs (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -241,7 +241,7 @@ FT_BEGIN_HEADER FT_Vector* delta ); /* */ - + /*************************************************************************/ /* */ /* */ diff --git a/include/freetype/ftimage.h b/include/freetype/ftimage.h index 5b25999d2..bc01f5717 100644 --- a/include/freetype/ftimage.h +++ b/include/freetype/ftimage.h @@ -5,7 +5,7 @@ /* FreeType glyph image formats and default raster interface */ /* (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -390,7 +390,7 @@ FT_BEGIN_HEADER } FT_Outline_Flags; /* */ - + #define FT_CURVE_TAG( flag ) ( flag & 3 ) #define FT_Curve_Tag_On 1 diff --git a/include/freetype/ftlist.h b/include/freetype/ftlist.h index a8bbf5062..1c5101700 100644 --- a/include/freetype/ftlist.h +++ b/include/freetype/ftlist.h @@ -4,7 +4,7 @@ /* */ /* Generic list support for FreeType (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -68,7 +68,7 @@ FT_BEGIN_HEADER /* */ /*************************************************************************/ - + /*************************************************************************/ /* */ /* */ @@ -259,7 +259,7 @@ FT_BEGIN_HEADER /* */ - + FT_END_HEADER #endif /* __FTLIST_H__ */ diff --git a/include/freetype/ftmac.h b/include/freetype/ftmac.h index c105f3290..6a1b4c8b6 100644 --- a/include/freetype/ftmac.h +++ b/include/freetype/ftmac.h @@ -4,7 +4,7 @@ /* */ /* Additional Mac-specific API. */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/ftmm.h b/include/freetype/ftmm.h index f1e420317..5e681b2c4 100644 --- a/include/freetype/ftmm.h +++ b/include/freetype/ftmm.h @@ -4,7 +4,7 @@ /* */ /* FreeType Multiple Master font interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/ftmodule.h b/include/freetype/ftmodule.h index be219ae8e..97718ad4b 100644 --- a/include/freetype/ftmodule.h +++ b/include/freetype/ftmodule.h @@ -4,7 +4,7 @@ /* */ /* FreeType modules public interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/ftoutln.h b/include/freetype/ftoutln.h index c475baa23..9dc1c6444 100644 --- a/include/freetype/ftoutln.h +++ b/include/freetype/ftoutln.h @@ -5,7 +5,7 @@ /* Support for the FT_Outline type used to store glyph shapes of */ /* most scalable font formats (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/ftrender.h b/include/freetype/ftrender.h index 4cf824fc5..2a0b12224 100644 --- a/include/freetype/ftrender.h +++ b/include/freetype/ftrender.h @@ -4,7 +4,7 @@ /* */ /* FreeType renderer modules public interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/ftsnames.h b/include/freetype/ftsnames.h index c429605e3..727e451e8 100644 --- a/include/freetype/ftsnames.h +++ b/include/freetype/ftsnames.h @@ -7,7 +7,7 @@ /* */ /* This is _not_ used to retrieve glyph names! */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/ftsynth.h b/include/freetype/ftsynth.h index 9504cfb75..4c7752ae2 100644 --- a/include/freetype/ftsynth.h +++ b/include/freetype/ftsynth.h @@ -5,7 +5,7 @@ /* FreeType synthesizing code for emboldening and slanting */ /* (specification). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/ftsystem.h b/include/freetype/ftsystem.h index 099961910..d6fc3e144 100644 --- a/include/freetype/ftsystem.h +++ b/include/freetype/ftsystem.h @@ -4,7 +4,7 @@ /* */ /* FreeType low-level system interface definition (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/fttrigon.h b/include/freetype/fttrigon.h index c2356f723..9762189e5 100644 --- a/include/freetype/fttrigon.h +++ b/include/freetype/fttrigon.h @@ -130,7 +130,7 @@ FT_BEGIN_HEADER /* function @FT_Vector_Unit. */ /* */ FT_EXPORT( FT_Fixed ) - FT_Cos( FT_Angle angle ); + FT_Cos( FT_Angle angle ); /*************************************************************************/ @@ -272,7 +272,7 @@ FT_BEGIN_HEADER FT_Angle *angle ); /* */ - + FT_END_HEADER #endif /* __FTTRIGON_H__ */ diff --git a/include/freetype/fttypes.h b/include/freetype/fttypes.h index 46ce07511..15aa6a5b4 100644 --- a/include/freetype/fttypes.h +++ b/include/freetype/fttypes.h @@ -4,7 +4,7 @@ /* */ /* FreeType simple types definitions (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/internal/autohint.h b/include/freetype/internal/autohint.h index cbfc1855d..40ade95f1 100644 --- a/include/freetype/internal/autohint.h +++ b/include/freetype/internal/autohint.h @@ -4,7 +4,7 @@ /* */ /* High-level `autohint' module-specific interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -101,11 +101,11 @@ FT_BEGIN_HEADER /* */ /* global_len :: The size in bytes of the global hints. */ /* */ - typedef void (*FT_AutoHinter_Get_Global_Func)( - FT_AutoHinter hinter, - FT_Face face, - void** global_hints, - long* global_len ); + typedef void + (*FT_AutoHinter_Get_Global_Func)( FT_AutoHinter hinter, + FT_Face face, + void** global_hints, + long* global_len ); /*************************************************************************/ @@ -123,8 +123,9 @@ FT_BEGIN_HEADER /* */ /* global :: A pointer to retrieved global hints to discard. */ /* */ - typedef void (*FT_AutoHinter_Done_Global_Func)( FT_AutoHinter hinter, - void* global ); + typedef void + (*FT_AutoHinter_Done_Global_Func)( FT_AutoHinter hinter, + void* global ); /*************************************************************************/ @@ -142,8 +143,9 @@ FT_BEGIN_HEADER /* */ /* face :: A handle to the face. */ /* */ - typedef void (*FT_AutoHinter_Reset_Func)( FT_AutoHinter hinter, - FT_Face face ); + typedef void + (*FT_AutoHinter_Reset_Func)( FT_AutoHinter hinter, + FT_Face face ); /*************************************************************************/ @@ -167,11 +169,12 @@ FT_BEGIN_HEADER /* It will call the font driver with FT_Load_Glyph(), with */ /* FT_LOAD_NO_SCALE set. */ /* */ - typedef FT_Error (*FT_AutoHinter_Load_Func)( FT_AutoHinter hinter, - FT_GlyphSlot slot, - FT_Size size, - FT_UInt glyph_index, - FT_ULong load_flags ); + typedef FT_Error + (*FT_AutoHinter_Load_Func)( FT_AutoHinter hinter, + FT_GlyphSlot slot, + FT_Size size, + FT_UInt glyph_index, + FT_ULong load_flags ); /*************************************************************************/ diff --git a/include/freetype/internal/cfftypes.h b/include/freetype/internal/cfftypes.h index f90d43b17..4465f5785 100644 --- a/include/freetype/internal/cfftypes.h +++ b/include/freetype/internal/cfftypes.h @@ -5,7 +5,7 @@ /* Basic OpenType/CFF type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -67,21 +67,21 @@ FT_BEGIN_HEADER { FT_UInt format; FT_ULong offset; - + FT_UShort* sids; FT_UShort* codes; - + } CFF_Encoding; typedef struct CFF_Charset_ { - + FT_UInt format; FT_ULong offset; FT_UShort* sids; - + } CFF_Charset; @@ -222,7 +222,7 @@ FT_BEGIN_HEADER CFF_Encoding encoding; CFF_Charset charset; - + CFF_Index charstrings_index; CFF_Index font_dict_index; CFF_Index private_index; diff --git a/include/freetype/internal/fnttypes.h b/include/freetype/internal/fnttypes.h index 446b4b13c..31edaa978 100644 --- a/include/freetype/internal/fnttypes.h +++ b/include/freetype/internal/fnttypes.h @@ -5,7 +5,7 @@ /* Basic Windows FNT/FON type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/internal/ftcalc.h b/include/freetype/internal/ftcalc.h index cb588e1b4..4cdf40fb1 100644 --- a/include/freetype/internal/ftcalc.h +++ b/include/freetype/internal/ftcalc.h @@ -4,7 +4,7 @@ /* */ /* Arithmetic computations (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -41,6 +41,7 @@ FT_BEGIN_HEADER #define SQRT_64( z ) FT_Sqrt64( z ) + /*************************************************************************/ /* */ /* */ @@ -57,7 +58,8 @@ FT_BEGIN_HEADER /* */ /* The 32-bit square-root. */ /* */ - FT_EXPORT( FT_Int32 ) FT_Sqrt64( FT_Int64 l ); + FT_EXPORT( FT_Int32 ) + FT_Sqrt64( FT_Int64 l ); #else /* !FT_LONG64 */ @@ -94,9 +96,10 @@ FT_BEGIN_HEADER /* */ /* Will be wrapped by the ADD_64() macro. */ /* */ - FT_EXPORT( void ) FT_Add64( FT_Int64* x, - FT_Int64* y, - FT_Int64 *z ); + FT_EXPORT( void ) + FT_Add64( FT_Int64* x, + FT_Int64* y, + FT_Int64 *z ); /*************************************************************************/ @@ -117,9 +120,10 @@ FT_BEGIN_HEADER /* */ /* Will be wrapped by the MUL_64() macro. */ /* */ - FT_EXPORT( void ) FT_MulTo64( FT_Int32 x, - FT_Int32 y, - FT_Int64 *z ); + FT_EXPORT( void ) + FT_MulTo64( FT_Int32 x, + FT_Int32 y, + FT_Int64 *z ); /*************************************************************************/ @@ -141,12 +145,14 @@ FT_BEGIN_HEADER /* */ /* Will be wrapped by the DIV_64() macro. */ /* */ - FT_EXPORT( FT_Int32 ) FT_Div64by32( FT_Int64* x, - FT_Int32 y ); + FT_EXPORT( FT_Int32 ) + FT_Div64by32( FT_Int64* x, + FT_Int32 y ); #define SQRT_64( z ) FT_Sqrt64( &z ) + /*************************************************************************/ /* */ /* */ @@ -163,7 +169,9 @@ FT_BEGIN_HEADER /* */ /* The 32-bit square-root. */ /* */ - FT_EXPORT( FT_Int32 ) FT_Sqrt64( FT_Int64* x ); + FT_EXPORT( FT_Int32 ) + FT_Sqrt64( FT_Int64* x ); + #endif /* !FT_LONG64 */ @@ -178,6 +186,7 @@ FT_BEGIN_HEADER #define SQRT_32( x ) FT_Sqrt32( x ) + /*************************************************************************/ /* */ /* */ @@ -193,7 +202,9 @@ FT_BEGIN_HEADER /* */ /* The result of `sqrt(x)'. */ /* */ - FT_EXPORT( FT_Int32 ) FT_Sqrt32( FT_Int32 x ); + FT_EXPORT( FT_Int32 ) + FT_Sqrt32( FT_Int32 x ); + #endif /* !FT_CONFIG_OPTION_OLD_CALCS */ diff --git a/include/freetype/internal/ftdebug.h b/include/freetype/internal/ftdebug.h index 9293640bf..f8765801c 100644 --- a/include/freetype/internal/ftdebug.h +++ b/include/freetype/internal/ftdebug.h @@ -4,7 +4,7 @@ /* */ /* Debugging and logging component (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -146,8 +146,9 @@ FT_BEGIN_HEADER /* */ /* level :: The tracing level. */ /* */ - FT_EXPORT( void ) FT_SetTraceLevel( FT_Trace component, - char level ); + FT_EXPORT( void ) + FT_SetTraceLevel( FT_Trace component, + char level ); #elif defined( FT_DEBUG_LEVEL_ERROR ) @@ -193,10 +194,12 @@ FT_BEGIN_HEADER } while ( 0 ) /* print a message */ - FT_EXPORT( void ) FT_Message( const char* fmt, ... ); + FT_EXPORT( void ) + FT_Message( const char* fmt, ... ); /* print a message and exit */ - FT_EXPORT( void ) FT_Panic( const char* fmt, ... ); + FT_EXPORT( void ) + FT_Panic( const char* fmt, ... ); #define FT_ERROR( varformat ) FT_Message varformat diff --git a/include/freetype/internal/ftdriver.h b/include/freetype/internal/ftdriver.h index 2cd51ce0b..6d5857342 100644 --- a/include/freetype/internal/ftdriver.h +++ b/include/freetype/internal/ftdriver.h @@ -4,7 +4,7 @@ /* */ /* FreeType font driver interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -27,59 +27,72 @@ FT_BEGIN_HEADER - typedef FT_Error (*FTDriver_initFace) ( FT_Stream stream, - FT_Face face, - FT_Int typeface_index, - FT_Int num_params, - FT_Parameter* parameters ); + typedef FT_Error + (*FTDriver_initFace)( FT_Stream stream, + FT_Face face, + FT_Int typeface_index, + FT_Int num_params, + FT_Parameter* parameters ); - typedef void (*FTDriver_doneFace) ( FT_Face face ); + typedef void + (*FTDriver_doneFace)( FT_Face face ); - typedef FT_Error (*FTDriver_initSize) ( FT_Size size ); + typedef FT_Error + (*FTDriver_initSize)( FT_Size size ); - typedef void (*FTDriver_doneSize) ( FT_Size size ); + typedef void + (*FTDriver_doneSize)( FT_Size size ); - typedef FT_Error (*FTDriver_initGlyphSlot)( FT_GlyphSlot slot ); + typedef FT_Error + (*FTDriver_initGlyphSlot)( FT_GlyphSlot slot ); - typedef void (*FTDriver_doneGlyphSlot)( FT_GlyphSlot slot ); + typedef void + (*FTDriver_doneGlyphSlot)( FT_GlyphSlot slot ); - typedef FT_Error (*FTDriver_setCharSizes) ( FT_Size size, - FT_F26Dot6 char_width, - FT_F26Dot6 char_height, - FT_UInt horz_resolution, - FT_UInt vert_resolution ); + typedef FT_Error + (*FTDriver_setCharSizes)( FT_Size size, + FT_F26Dot6 char_width, + FT_F26Dot6 char_height, + FT_UInt horz_resolution, + FT_UInt vert_resolution ); - typedef FT_Error (*FTDriver_setPixelSizes)( FT_Size size, - FT_UInt pixel_width, - FT_UInt pixel_height ); + typedef FT_Error + (*FTDriver_setPixelSizes)( FT_Size size, + FT_UInt pixel_width, + FT_UInt pixel_height ); - typedef FT_Error (*FTDriver_loadGlyph) ( FT_GlyphSlot slot, - FT_Size size, - FT_UInt glyph_index, - FT_Int load_flags ); + typedef FT_Error + (*FTDriver_loadGlyph)( FT_GlyphSlot slot, + FT_Size size, + FT_UInt glyph_index, + FT_Int load_flags ); - typedef FT_UInt (*FTDriver_getCharIndex) ( FT_CharMap charmap, - FT_Long charcode ); + typedef FT_UInt + (*FTDriver_getCharIndex)( FT_CharMap charmap, + FT_Long charcode ); - typedef FT_Error (*FTDriver_getKerning) ( FT_Face face, - FT_UInt left_glyph, - FT_UInt right_glyph, - FT_Vector* kerning ); + typedef FT_Error + (*FTDriver_getKerning)( FT_Face face, + FT_UInt left_glyph, + FT_UInt right_glyph, + FT_Vector* kerning ); - typedef FT_Error (*FTDriver_attachFile) ( FT_Face face, - FT_Stream stream ); + typedef FT_Error + (*FTDriver_attachFile)( FT_Face face, + FT_Stream stream ); - typedef FT_Error (*FTDriver_getAdvances) ( FT_Face face, - FT_UInt first, - FT_UInt count, - FT_Bool vertical, - FT_UShort* advances ); + typedef FT_Error + (*FTDriver_getAdvances)( FT_Face face, + FT_UInt first, + FT_UInt count, + FT_Bool vertical, + FT_UShort* advances ); /*************************************************************************/ diff --git a/include/freetype/internal/ftextend.h b/include/freetype/internal/ftextend.h index 05ef864e9..8257a2a3b 100644 --- a/include/freetype/internal/ftextend.h +++ b/include/freetype/internal/ftextend.h @@ -4,7 +4,7 @@ /* */ /* FreeType extensions implementation (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -59,8 +59,9 @@ FT_BEGIN_HEADER /* data, as the finalizer will get called later by the function's */ /* caller. */ /* */ - typedef FT_Error (*FT_Extension_Initializer)( void* ext, - FT_Face face ); + typedef FT_Error + (*FT_Extension_Initializer)( void* ext, + FT_Face face ); /*************************************************************************/ @@ -80,8 +81,9 @@ FT_BEGIN_HEADER /* face :: A handle to the source face object the extension is */ /* associated with. */ /* */ - typedef void (*FT_Extension_Finalizer)( void* ext, - FT_Face face ); + typedef void + (*FT_Extension_Finalizer)( void* ext, + FT_Face face ); /*************************************************************************/ @@ -145,30 +147,31 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Register_Extension( FT_Driver driver, - FT_Extension_Class* clazz ); + FT_EXPORT( FT_Error ) + FT_Register_Extension( FT_Driver driver, + FT_Extension_Class* clazz ); #ifdef FT_CONFIG_OPTION_EXTEND_ENGINE /* Initialize the extension component */ - FT_LOCAL - FT_Error FT_Init_Extensions( FT_Library library ); + FT_LOCAL FT_Error + FT_Init_Extensions( FT_Library library ); /* Finalize the extension component */ - FT_LOCAL - FT_Error FT_Done_Extensions( FT_Library library ); + FT_LOCAL FT_Error + FT_Done_Extensions( FT_Library library ); /* Create an extension within a face object. Called by the */ /* face object constructor. */ - FT_LOCAL - FT_Error FT_Create_Extensions( FT_Face face ); + FT_LOCAL FT_Error + FT_Create_Extensions( FT_Face face ); /* Destroy all extensions within a face object. Called by the */ /* face object destructor. */ - FT_LOCAL - FT_Error FT_Destroy_Extensions( FT_Face face ); + FT_LOCAL FT_Error + FT_Destroy_Extensions( FT_Face face ); #endif @@ -194,9 +197,10 @@ FT_BEGIN_HEADER /* */ /* A generic pointer to the extension block. */ /* */ - FT_EXPORT( void* ) FT_Get_Extension( FT_Face face, - const char* extension_id, - void** extension_interface ); + FT_EXPORT( void* ) + FT_Get_Extension( FT_Face face, + const char* extension_id, + void** extension_interface ); FT_END_HEADER diff --git a/include/freetype/internal/ftmemory.h b/include/freetype/internal/ftmemory.h index 27b572f1a..e64865ea7 100644 --- a/include/freetype/internal/ftmemory.h +++ b/include/freetype/internal/ftmemory.h @@ -4,7 +4,7 @@ /* */ /* The FreeType memory management macros (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -78,9 +78,10 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_BASE( FT_Error ) FT_Alloc( FT_Memory memory, - FT_Long size, - void* *P ); + FT_BASE( FT_Error ) + FT_Alloc( FT_Memory memory, + FT_Long size, + void* *P ); /*************************************************************************/ @@ -111,10 +112,11 @@ FT_BEGIN_HEADER /* All callers of FT_Realloc() _must_ provide the current block size */ /* as well as the new one. */ /* */ - FT_BASE( FT_Error ) FT_Realloc( FT_Memory memory, - FT_Long current, - FT_Long size, - void** P ); + FT_BASE( FT_Error ) + FT_Realloc( FT_Memory memory, + FT_Long current, + FT_Long size, + void** P ); /*************************************************************************/ @@ -140,8 +142,9 @@ FT_BEGIN_HEADER /* This is a strong convention within all of FreeType and its */ /* drivers. */ /* */ - FT_BASE( void ) FT_Free( FT_Memory memory, - void** P ); + FT_BASE( void ) + FT_Free( FT_Memory memory, + void** P ); diff --git a/include/freetype/internal/ftobjs.h b/include/freetype/internal/ftobjs.h index f295330d8..a24fd156d 100644 --- a/include/freetype/internal/ftobjs.h +++ b/include/freetype/internal/ftobjs.h @@ -4,7 +4,7 @@ /* */ /* The FreeType private base classes (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -136,7 +136,7 @@ FT_BEGIN_HEADER FT_Matrix transform_matrix; FT_Vector transform_delta; FT_Int transform_flags; - + } FT_Face_InternalRec; @@ -172,9 +172,10 @@ FT_BEGIN_HEADER FT_Bool glyph_transformed; FT_Matrix glyph_matrix; FT_Vector glyph_delta; - + } FT_GlyphSlot_InternalRec; + /*************************************************************************/ /*************************************************************************/ /*************************************************************************/ @@ -264,8 +265,9 @@ FT_BEGIN_HEADER /* You should better be familiar with FreeType internals to know */ /* which module to look for, and what its interface is :-) */ /* */ - FT_BASE( const void* ) FT_Get_Module_Interface( FT_Library library, - const char* mod_name ); + FT_BASE( const void* ) + FT_Get_Module_Interface( FT_Library library, + const char* mod_name ); /*************************************************************************/ @@ -317,8 +319,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_New_Size( FT_Face face, - FT_Size* size ); + FT_EXPORT( FT_Error ) + FT_New_Size( FT_Face face, + FT_Size* size ); /*************************************************************************/ @@ -335,7 +338,8 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_Done_Size( FT_Size size ); + FT_EXPORT( FT_Error ) + FT_Done_Size( FT_Size size ); /*************************************************************************/ @@ -358,8 +362,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_BASE( FT_Error ) FT_New_GlyphSlot( FT_Face face, - FT_GlyphSlot *aslot ); + FT_BASE( FT_Error ) + FT_New_GlyphSlot( FT_Face face, + FT_GlyphSlot *aslot ); /*************************************************************************/ @@ -375,7 +380,8 @@ FT_BEGIN_HEADER /* */ /* slot :: A handle to a target glyph slot. */ /* */ - FT_BASE( void ) FT_Done_GlyphSlot( FT_GlyphSlot slot ); + FT_BASE( void ) + FT_Done_GlyphSlot( FT_GlyphSlot slot ); /*************************************************************************/ @@ -442,33 +448,40 @@ FT_BEGIN_HEADER }; - FT_BASE( FT_Error ) FT_GlyphLoader_New( FT_Memory memory, - FT_GlyphLoader* *aloader ); + FT_BASE( FT_Error ) + FT_GlyphLoader_New( FT_Memory memory, + FT_GlyphLoader* *aloader ); - FT_BASE( FT_Error ) FT_GlyphLoader_Create_Extra( - FT_GlyphLoader* loader ); + FT_BASE( FT_Error ) + FT_GlyphLoader_Create_Extra( FT_GlyphLoader* loader ); - FT_BASE( void ) FT_GlyphLoader_Done( FT_GlyphLoader* loader ); + FT_BASE( void ) + FT_GlyphLoader_Done( FT_GlyphLoader* loader ); - FT_BASE( void ) FT_GlyphLoader_Reset( FT_GlyphLoader* loader ); + FT_BASE( void ) + FT_GlyphLoader_Reset( FT_GlyphLoader* loader ); - FT_BASE( void ) FT_GlyphLoader_Rewind( FT_GlyphLoader* loader ); + FT_BASE( void ) + FT_GlyphLoader_Rewind( FT_GlyphLoader* loader ); - FT_BASE( FT_Error ) FT_GlyphLoader_Check_Points( - FT_GlyphLoader* loader, - FT_UInt n_points, - FT_UInt n_contours ); + FT_BASE( FT_Error ) + FT_GlyphLoader_Check_Points( FT_GlyphLoader* loader, + FT_UInt n_points, + FT_UInt n_contours ); - FT_BASE( FT_Error ) FT_GlyphLoader_Check_Subglyphs( - FT_GlyphLoader* loader, - FT_UInt n_subs ); + FT_BASE( FT_Error ) + FT_GlyphLoader_Check_Subglyphs( FT_GlyphLoader* loader, + FT_UInt n_subs ); - FT_BASE( void ) FT_GlyphLoader_Prepare( FT_GlyphLoader* loader ); + FT_BASE( void ) + FT_GlyphLoader_Prepare( FT_GlyphLoader* loader ); - FT_BASE( void ) FT_GlyphLoader_Add( FT_GlyphLoader* loader ); + FT_BASE( void ) + FT_GlyphLoader_Add( FT_GlyphLoader* loader ); - FT_BASE( FT_Error ) FT_GlyphLoader_Copy_Points( FT_GlyphLoader* target, - FT_GlyphLoader* source ); + FT_BASE( FT_Error ) + FT_GlyphLoader_Copy_Points( FT_GlyphLoader* target, + FT_GlyphLoader* source ); /*************************************************************************/ @@ -647,18 +660,21 @@ FT_BEGIN_HEADER } FT_LibraryRec; - FT_BASE( FT_Renderer ) FT_Lookup_Renderer( FT_Library library, - FT_Glyph_Format format, - FT_ListNode* node ); + FT_BASE( FT_Renderer ) + FT_Lookup_Renderer( FT_Library library, + FT_Glyph_Format format, + FT_ListNode* node ); - FT_BASE( FT_Error ) FT_Render_Glyph_Internal( FT_Library library, - FT_GlyphSlot slot, - FT_UInt render_mode ); + FT_BASE( FT_Error ) + FT_Render_Glyph_Internal( FT_Library library, + FT_GlyphSlot slot, + FT_UInt render_mode ); - typedef FT_Error (*FT_Glyph_Name_Requester)( FT_Face face, - FT_UInt glyph_index, - FT_Pointer buffer, - FT_UInt buffer_max ); + typedef FT_Error + (*FT_Glyph_Name_Requester)( FT_Face face, + FT_UInt glyph_index, + FT_Pointer buffer, + FT_UInt buffer_max ); #ifndef FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM @@ -680,8 +696,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - FT_EXPORT( FT_Error ) FT_New_Stream( const char* filepathname, - FT_Stream astream ); + FT_EXPORT( FT_Error ) + FT_New_Stream( const char* filepathname, + FT_Stream astream ); /*************************************************************************/ @@ -695,7 +712,8 @@ FT_BEGIN_HEADER /* */ /* stream :: The stream to be closed and destroyed. */ /* */ - FT_EXPORT( void ) FT_Done_Stream( FT_Stream stream ); + FT_EXPORT( void ) + FT_Done_Stream( FT_Stream stream ); /*************************************************************************/ @@ -709,7 +727,8 @@ FT_BEGIN_HEADER /* */ /* A pointer to the new memory object. 0 in case of error. */ /* */ - FT_EXPORT( FT_Memory ) FT_New_Memory( void ); + FT_EXPORT( FT_Memory ) + FT_New_Memory( void ); /*************************************************************************/ @@ -723,7 +742,8 @@ FT_BEGIN_HEADER /* */ /* memory :: A handle to the memory manager. */ /* */ - FT_EXPORT( void ) FT_Done_Memory( FT_Memory memory ); + FT_EXPORT( void ) + FT_Done_Memory( FT_Memory memory ); #endif /* !FT_CONFIG_OPTION_NO_DEFAULT_SYSTEM */ diff --git a/include/freetype/internal/ftstream.h b/include/freetype/internal/ftstream.h index a5faefbe2..c7b536d57 100644 --- a/include/freetype/internal/ftstream.h +++ b/include/freetype/internal/ftstream.h @@ -4,7 +4,7 @@ /* */ /* Stream handling(specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -92,10 +92,10 @@ FT_BEGIN_HEADER /* calling the FT_FRAME_START() macro. */ #define FT_FIELD_SIZE( f ) \ (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f ) - + #define FT_FIELD_SIZE_DELTA( f ) \ (FT_Byte)sizeof ( ((FT_STRUCTURE*)0)->f[0] ) - + #define FT_FIELD_OFFSET( f ) \ (FT_UShort)( offsetof( FT_STRUCTURE, f ) ) @@ -259,75 +259,98 @@ FT_BEGIN_HEADER #define READ_ULongLE( var ) FT_READ_MACRO( FT_Read_LongLE, FT_ULong, var ) - FT_BASE( void ) FT_New_Memory_Stream( FT_Library library, - FT_Byte* base, - FT_ULong size, - FT_Stream stream ); + FT_BASE( void ) + FT_New_Memory_Stream( FT_Library library, + FT_Byte* base, + FT_ULong size, + FT_Stream stream ); - FT_BASE( FT_Error ) FT_Seek_Stream( FT_Stream stream, - FT_ULong pos ); + FT_BASE( FT_Error ) + FT_Seek_Stream( FT_Stream stream, + FT_ULong pos ); - FT_BASE( FT_Error ) FT_Skip_Stream( FT_Stream stream, - FT_Long distance ); + FT_BASE( FT_Error ) + FT_Skip_Stream( FT_Stream stream, + FT_Long distance ); - FT_BASE( FT_Long ) FT_Stream_Pos( FT_Stream stream ); + FT_BASE( FT_Long ) + FT_Stream_Pos( FT_Stream stream ); - FT_BASE( FT_Error ) FT_Read_Stream( FT_Stream stream, - FT_Byte* buffer, - FT_ULong count ); + FT_BASE( FT_Error ) + FT_Read_Stream( FT_Stream stream, + FT_Byte* buffer, + FT_ULong count ); - FT_BASE( FT_Error ) FT_Read_Stream_At( FT_Stream stream, - FT_ULong pos, - FT_Byte* buffer, - FT_ULong count ); + FT_BASE( FT_Error ) + FT_Read_Stream_At( FT_Stream stream, + FT_ULong pos, + FT_Byte* buffer, + FT_ULong count ); - FT_BASE( FT_Error ) FT_Access_Frame( FT_Stream stream, - FT_ULong count ); + FT_BASE( FT_Error ) + FT_Access_Frame( FT_Stream stream, + FT_ULong count ); - FT_BASE( void ) FT_Forget_Frame( FT_Stream stream ); + FT_BASE( void ) + FT_Forget_Frame( FT_Stream stream ); - FT_BASE( FT_Error ) FT_Extract_Frame( FT_Stream stream, - FT_ULong count, - FT_Byte** pbytes ); + FT_BASE( FT_Error ) + FT_Extract_Frame( FT_Stream stream, + FT_ULong count, + FT_Byte** pbytes ); - FT_BASE( void ) FT_Release_Frame( FT_Stream stream, - FT_Byte** pbytes ); + FT_BASE( void ) + FT_Release_Frame( FT_Stream stream, + FT_Byte** pbytes ); - FT_BASE( FT_Char ) FT_Get_Char( FT_Stream stream ); + FT_BASE( FT_Char ) + FT_Get_Char( FT_Stream stream ); - FT_BASE( FT_Short ) FT_Get_Short( FT_Stream stream ); + FT_BASE( FT_Short ) + FT_Get_Short( FT_Stream stream ); - FT_BASE( FT_Long ) FT_Get_Offset( FT_Stream stream ); + FT_BASE( FT_Long ) + FT_Get_Offset( FT_Stream stream ); - FT_BASE( FT_Long ) FT_Get_Long( FT_Stream stream ); + FT_BASE( FT_Long ) + FT_Get_Long( FT_Stream stream ); - FT_BASE( FT_Short ) FT_Get_ShortLE( FT_Stream stream ); + FT_BASE( FT_Short ) + FT_Get_ShortLE( FT_Stream stream ); - FT_BASE( FT_Long ) FT_Get_LongLE( FT_Stream stream ); + FT_BASE( FT_Long ) + FT_Get_LongLE( FT_Stream stream ); - FT_BASE( FT_Char ) FT_Read_Char( FT_Stream stream, - FT_Error* error ); + FT_BASE( FT_Char ) + FT_Read_Char( FT_Stream stream, + FT_Error* error ); - FT_BASE( FT_Short ) FT_Read_Short( FT_Stream stream, - FT_Error* error ); + FT_BASE( FT_Short ) + FT_Read_Short( FT_Stream stream, + FT_Error* error ); - FT_BASE( FT_Long ) FT_Read_Offset( FT_Stream stream, - FT_Error* error ); + FT_BASE( FT_Long ) + FT_Read_Offset( FT_Stream stream, + FT_Error* error ); - FT_BASE( FT_Long ) FT_Read_Long( FT_Stream stream, - FT_Error* error ); + FT_BASE( FT_Long ) + FT_Read_Long( FT_Stream stream, + FT_Error* error ); - FT_BASE( FT_Short ) FT_Read_ShortLE( FT_Stream stream, - FT_Error* error ); + FT_BASE( FT_Short ) + FT_Read_ShortLE( FT_Stream stream, + FT_Error* error ); - FT_BASE( FT_Long ) FT_Read_LongLE( FT_Stream stream, - FT_Error* error ); + FT_BASE( FT_Long ) + FT_Read_LongLE( FT_Stream stream, + FT_Error* error ); - FT_BASE( FT_Error ) FT_Read_Fields( FT_Stream stream, - const FT_Frame_Field* fields, - void* structure ); + FT_BASE( FT_Error ) + FT_Read_Fields( FT_Stream stream, + const FT_Frame_Field* fields, + void* structure ); #define USE_Stream( resource, stream ) \ diff --git a/include/freetype/internal/internal.h b/include/freetype/internal/internal.h index 58003e900..c2dea4f97 100644 --- a/include/freetype/internal/internal.h +++ b/include/freetype/internal/internal.h @@ -4,7 +4,7 @@ /* */ /* Internal header files (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/internal/pcftypes.h b/include/freetype/internal/pcftypes.h index 8febb2630..2ad4acef5 100644 --- a/include/freetype/internal/pcftypes.h +++ b/include/freetype/internal/pcftypes.h @@ -1,9 +1,9 @@ -/* pcftypes.h +/* pcftypes.h FreeType font driver for pcf fonts - Copyright (C) 2000 by - Francesco Zappa Nardelli + Copyright (C) 2000-2001 by + Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -39,7 +39,7 @@ FT_BEGIN_HEADER typedef struct PCF_Public_FaceRec_ { FT_FaceRec root; - + char* charset_encoding; char* charset_registry; diff --git a/include/freetype/internal/psaux.h b/include/freetype/internal/psaux.h index df839dea6..cfc0888f0 100644 --- a/include/freetype/internal/psaux.h +++ b/include/freetype/internal/psaux.h @@ -5,7 +5,7 @@ /* Auxiliary functions and data structures related to PostScript fonts */ /* (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -60,18 +60,22 @@ FT_BEGIN_HEADER /* */ typedef struct PS_Table_Funcs_ { - FT_Error (*init) ( PS_Table* table, - FT_Int count, - FT_Memory memory ); + FT_Error + (*init)( PS_Table* table, + FT_Int count, + FT_Memory memory ); - void (*done) ( PS_Table* table ); + void + (*done)( PS_Table* table ); - FT_Error (*add) ( PS_Table* table, - FT_Int index, - void* object, - FT_Int length ); + FT_Error + (*add)( PS_Table* table, + FT_Int index, + void* object, + FT_Int length ); - void (*release)( PS_Table* table ); + void + (*release)( PS_Table* table ); } PS_Table_Funcs; @@ -190,8 +194,9 @@ FT_BEGIN_HEADER } T1_Field_Location; - typedef void (*T1_Field_Parser)( FT_Face face, - FT_Pointer parser ); + typedef void + (*T1_Field_Parser)( FT_Face face, + FT_Pointer parser ); /* structure type used to model object fields */ @@ -291,45 +296,57 @@ FT_BEGIN_HEADER typedef struct T1_Parser_Funcs_ { - void (*init) ( T1_Parser* parser, - FT_Byte* base, - FT_Byte* limit, - FT_Memory memory ); + void + (*init)( T1_Parser* parser, + FT_Byte* base, + FT_Byte* limit, + FT_Memory memory ); - void (*done) ( T1_Parser* parser ); + void + (*done)( T1_Parser* parser ); - void (*skip_spaces) ( T1_Parser* parser ); - void (*skip_alpha) ( T1_Parser* parser ); + void + (*skip_spaces)( T1_Parser* parser ); + void + (*skip_alpha)( T1_Parser* parser ); - FT_Long (*to_int) ( T1_Parser* parser ); - FT_Fixed (*to_fixed) ( T1_Parser* parser, - FT_Int power_ten ); - FT_Int (*to_coord_array)( T1_Parser* parser, - FT_Int max_coords, - FT_Short* coords ); - FT_Int (*to_fixed_array)( T1_Parser* parser, - FT_Int max_values, - FT_Fixed* values, - FT_Int power_ten ); + FT_Long + (*to_int)( T1_Parser* parser ); + FT_Fixed + (*to_fixed)( T1_Parser* parser, + FT_Int power_ten ); + FT_Int + (*to_coord_array)( T1_Parser* parser, + FT_Int max_coords, + FT_Short* coords ); + FT_Int + (*to_fixed_array)( T1_Parser* parser, + FT_Int max_values, + FT_Fixed* values, + FT_Int power_ten ); - void (*to_token) ( T1_Parser* parser, - T1_Token* token ); - void (*to_token_array)( T1_Parser* parser, - T1_Token* tokens, - FT_UInt max_tokens, - FT_Int* pnum_tokens ); + void + (*to_token)( T1_Parser* parser, + T1_Token* token ); + void + (*to_token_array)( T1_Parser* parser, + T1_Token* tokens, + FT_UInt max_tokens, + FT_Int* pnum_tokens ); - FT_Error (*load_field) ( T1_Parser* parser, - const T1_Field* field, - void** objects, - FT_UInt max_objects, - FT_ULong* pflags ); + FT_Error + (*load_field)( T1_Parser* parser, + const T1_Field* field, + void** objects, + FT_UInt max_objects, + FT_ULong* pflags ); - FT_Error (*load_field_table)( T1_Parser* parser, - const T1_Field* field, - void** objects, - FT_UInt max_objects, - FT_ULong* pflags ); + FT_Error + (*load_field_table)( T1_Parser* parser, + const T1_Field* field, + void** objects, + FT_UInt max_objects, + FT_ULong* pflags ); } T1_Parser_Funcs; @@ -380,35 +397,43 @@ FT_BEGIN_HEADER typedef struct T1_Builder_ T1_Builder; - typedef FT_Error (*T1_Builder_Check_Points_Func) ( T1_Builder* builder, - FT_Int count ); + typedef FT_Error + (*T1_Builder_Check_Points_Func)( T1_Builder* builder, + FT_Int count ); - typedef void (*T1_Builder_Add_Point_Func) ( T1_Builder* builder, - FT_Pos x, - FT_Pos y, - FT_Byte flag ); + typedef void + (*T1_Builder_Add_Point_Func)( T1_Builder* builder, + FT_Pos x, + FT_Pos y, + FT_Byte flag ); - typedef FT_Error (*T1_Builder_Add_Point1_Func) ( T1_Builder* builder, - FT_Pos x, - FT_Pos y ); + typedef FT_Error + (*T1_Builder_Add_Point1_Func)( T1_Builder* builder, + FT_Pos x, + FT_Pos y ); - typedef FT_Error (*T1_Builder_Add_Contour_Func) ( T1_Builder* builder ); + typedef FT_Error + (*T1_Builder_Add_Contour_Func)( T1_Builder* builder ); - typedef FT_Error (*T1_Builder_Start_Point_Func) ( T1_Builder* builder, - FT_Pos x, - FT_Pos y ); + typedef FT_Error + (*T1_Builder_Start_Point_Func)( T1_Builder* builder, + FT_Pos x, + FT_Pos y ); - typedef void (*T1_Builder_Close_Contour_Func)( T1_Builder* builder ); + typedef void + (*T1_Builder_Close_Contour_Func)( T1_Builder* builder ); typedef struct T1_Builder_Funcs_ { - void (*init)( T1_Builder* builder, - FT_Face face, - FT_Size size, - FT_GlyphSlot slot ); + void + (*init)( T1_Builder* builder, + FT_Face face, + FT_Size size, + FT_GlyphSlot slot ); - void (*done)( T1_Builder* builder ); + void + (*done)( T1_Builder* builder ); T1_Builder_Check_Points_Func check_points; T1_Builder_Add_Point_Func add_point; @@ -551,25 +576,29 @@ FT_BEGIN_HEADER typedef struct T1_Decoder_Funcs_ T1_Decoder_Funcs; - typedef FT_Error (*T1_Decoder_Callback)( T1_Decoder* decoder, - FT_UInt glyph_index ); + typedef FT_Error + (*T1_Decoder_Callback)( T1_Decoder* decoder, + FT_UInt glyph_index ); struct T1_Decoder_Funcs_ { - FT_Error (*init) ( T1_Decoder* decoder, - FT_Face face, - FT_Size size, - FT_GlyphSlot slot, - FT_Byte** glyph_names, - T1_Blend* blend, - T1_Decoder_Callback callback ); + FT_Error + (*init)( T1_Decoder* decoder, + FT_Face face, + FT_Size size, + FT_GlyphSlot slot, + FT_Byte** glyph_names, + T1_Blend* blend, + T1_Decoder_Callback callback ); - void (*done) ( T1_Decoder* decoder ); + void + (*done)( T1_Decoder* decoder ); - FT_Error (*parse_charstrings)( T1_Decoder* decoder, - FT_Byte* base, - FT_UInt len ); + FT_Error + (*parse_charstrings)( T1_Decoder* decoder, + FT_Byte* base, + FT_UInt len ); }; @@ -621,9 +650,11 @@ FT_BEGIN_HEADER const T1_Builder_Funcs* t1_builder_funcs; const T1_Decoder_Funcs* t1_decoder_funcs; - void (*t1_decrypt)( FT_Byte* buffer, - FT_Offset length, - FT_UShort seed ); + void + (*t1_decrypt)( FT_Byte* buffer, + FT_Offset length, + FT_UShort seed ); + } PSAux_Interface; diff --git a/include/freetype/internal/psnames.h b/include/freetype/internal/psnames.h index 0e3157fc2..71700c192 100644 --- a/include/freetype/internal/psnames.h +++ b/include/freetype/internal/psnames.h @@ -5,7 +5,7 @@ /* High-level interface for the `PSNames' module (in charge of */ /* various functions related to Postscript glyph names conversion). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -52,7 +52,8 @@ FT_BEGIN_HEADER /* This function will not be compiled if the configuration macro */ /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST is undefined. */ /* */ - typedef FT_ULong (*PS_Unicode_Value_Func)( const char* glyph_name ); + typedef FT_ULong + (*PS_Unicode_Value_Func)( const char* glyph_name ); /*************************************************************************/ @@ -82,9 +83,10 @@ FT_BEGIN_HEADER /* This function will not be compiled if the configuration macro */ /* FT_CONFIG_OPTION_ADOBE_GLYPH_LIST is undefined. */ /* */ - typedef FT_UInt (*PS_Unicode_Index_Func)( FT_UInt num_glyphs, - const char** glyph_names, - FT_ULong unicode ); + typedef FT_UInt + (*PS_Unicode_Index_Func)( FT_UInt num_glyphs, + const char** glyph_names, + FT_ULong unicode ); /*************************************************************************/ @@ -106,10 +108,12 @@ FT_BEGIN_HEADER /* This function will not be compiled if the configuration macro */ /* FT_CONFIG_OPTION_POSTSCRIPT_NAMES is undefined. */ /* */ - typedef const char* (*PS_Macintosh_Name_Func)( FT_UInt name_index ); + typedef const char* + (*PS_Macintosh_Name_Func)( FT_UInt name_index ); - typedef const char* (*PS_Adobe_Std_Strings_Func)( FT_UInt string_index ); + typedef const char* + (*PS_Adobe_Std_Strings_Func)( FT_UInt string_index ); typedef struct PS_UniMap_ @@ -152,13 +156,15 @@ FT_BEGIN_HEADER } PS_Unicodes; - typedef FT_Error (*PS_Build_Unicodes_Func)( FT_Memory memory, - FT_UInt num_glyphs, - const char** glyph_names, - PS_Unicodes* unicodes ); + typedef FT_Error + (*PS_Build_Unicodes_Func)( FT_Memory memory, + FT_UInt num_glyphs, + const char** glyph_names, + PS_Unicodes* unicodes ); - typedef FT_UInt (*PS_Lookup_Unicode_Func)( PS_Unicodes* unicodes, - FT_UInt unicode ); + typedef FT_UInt + (*PS_Lookup_Unicode_Func)( PS_Unicodes* unicodes, + FT_UInt unicode ); /*************************************************************************/ diff --git a/include/freetype/internal/sfnt.h b/include/freetype/internal/sfnt.h index 9263a5b0c..bfcce5d55 100644 --- a/include/freetype/internal/sfnt.h +++ b/include/freetype/internal/sfnt.h @@ -4,7 +4,7 @@ /* */ /* High-level `sfnt' driver interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -63,12 +63,12 @@ FT_BEGIN_HEADER /* should then call the TT_Load_Face_Func() callback to read the rest */ /* of the SFNT tables in the object. */ /* */ - typedef - FT_Error (*TT_Init_Face_Func)( FT_Stream stream, - TT_Face face, - FT_Int face_index, - FT_Int num_params, - FT_Parameter* params ); + typedef FT_Error + (*TT_Init_Face_Func)( FT_Stream stream, + TT_Face face, + FT_Int face_index, + FT_Int num_params, + FT_Parameter* params ); /*************************************************************************/ @@ -99,12 +99,12 @@ FT_BEGIN_HEADER /* */ /* This function must be called after TT_Init_Face_Func(). */ /* */ - typedef - FT_Error (*TT_Load_Face_Func)( FT_Stream stream, - TT_Face face, - FT_Int face_index, - FT_Int num_params, - FT_Parameter* params ); + typedef FT_Error + (*TT_Load_Face_Func)( FT_Stream stream, + TT_Face face, + FT_Int face_index, + FT_Int num_params, + FT_Parameter* params ); /*************************************************************************/ @@ -121,13 +121,13 @@ FT_BEGIN_HEADER /* */ /* This function does NOT destroy the face object. */ /* */ - typedef - void (*TT_Done_Face_Func)( TT_Face face ); + typedef void + (*TT_Done_Face_Func)( TT_Face face ); - typedef - FT_Module_Interface (*SFNT_Get_Interface_Func)( FT_Module module, - const char* interface ); + typedef FT_Module_Interface + (*SFNT_Get_Interface_Func)( FT_Module module, + const char* interface ); /*************************************************************************/ @@ -161,11 +161,11 @@ FT_BEGIN_HEADER /* This function checks that the header is valid by looking at the */ /* values of `search_range', `entry_selector', and `range_shift'. */ /* */ - typedef - FT_Error (*TT_Load_SFNT_Header_Func)( TT_Face face, - FT_Stream stream, - FT_Long face_index, - SFNT_Header* sfnt ); + typedef FT_Error + (*TT_Load_SFNT_Header_Func)( TT_Face face, + FT_Stream stream, + FT_Long face_index, + SFNT_Header* sfnt ); /*************************************************************************/ @@ -191,10 +191,10 @@ FT_BEGIN_HEADER /* format tag. This is the case just after a call to */ /* TT_Load_Format_Tag(). */ /* */ - typedef - FT_Error (*TT_Load_Directory_Func)( TT_Face face, - FT_Stream stream, - SFNT_Header* sfnt ); + typedef FT_Error + (*TT_Load_Directory_Func)( TT_Face face, + FT_Stream stream, + SFNT_Header* sfnt ); /*************************************************************************/ @@ -237,12 +237,12 @@ FT_BEGIN_HEADER /* */ /* TrueType error code. 0 means success. */ /* */ - typedef - FT_Error (*TT_Load_Any_Func)( TT_Face face, - FT_ULong tag, - FT_Long offset, - FT_Byte *buffer, - FT_ULong* length ); + typedef FT_Error + (*TT_Load_Any_Func)( TT_Face face, + FT_ULong tag, + FT_Long offset, + FT_Byte *buffer, + FT_ULong* length ); /*************************************************************************/ @@ -277,14 +277,14 @@ FT_BEGIN_HEADER /* */ /* The `map.buffer' field is always freed before the glyph is loaded. */ /* */ - typedef - FT_Error (*TT_Load_SBit_Image_Func)( TT_Face face, - FT_ULong strike_index, - FT_UInt glyph_index, - FT_UInt load_flags, - FT_Stream stream, - FT_Bitmap *amap, - TT_SBit_Metrics *ametrics ); + typedef FT_Error + (*TT_Load_SBit_Image_Func)( TT_Face face, + FT_ULong strike_index, + FT_UInt glyph_index, + FT_UInt load_flags, + FT_Stream stream, + FT_Bitmap *amap, + TT_SBit_Metrics *ametrics ); /*************************************************************************/ @@ -310,11 +310,11 @@ FT_BEGIN_HEADER /* FreeType error code. 0 means success. Returns an error if no */ /* sbit strike exists for the selected ppem values. */ /* */ - typedef - FT_Error (*TT_Set_SBit_Strike_Func)( TT_Face face, - FT_Int x_ppem, - FT_Int y_ppem, - FT_ULong *astrike_index ); + typedef FT_Error + (*TT_Set_SBit_Strike_Func)( TT_Face face, + FT_Int x_ppem, + FT_Int y_ppem, + FT_ULong *astrike_index ); /*************************************************************************/ @@ -336,10 +336,10 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - typedef - FT_Error (*TT_Get_PS_Name_Func)( TT_Face face, - FT_UInt index, - FT_String** PSname ); + typedef FT_Error + (*TT_Get_PS_Name_Func)( TT_Face face, + FT_UInt index, + FT_String** PSname ); /*************************************************************************/ @@ -360,10 +360,10 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - typedef - FT_Error (*TT_Load_Metrics_Func)( TT_Face face, - FT_Stream stream, - FT_Bool vertical ); + typedef FT_Error + (*TT_Load_Metrics_Func)( TT_Face face, + FT_Stream stream, + FT_Bool vertical ); /*************************************************************************/ @@ -390,10 +390,10 @@ FT_BEGIN_HEADER /* opened). In case of error, all partially allocated tables are */ /* released. */ /* */ - typedef - FT_Error (*TT_CharMap_Load_Func)( TT_Face face, - TT_CMapTable* cmap, - FT_Stream input ); + typedef FT_Error + (*TT_CharMap_Load_Func)( TT_Face face, + TT_CMapTable* cmap, + FT_Stream input ); /*************************************************************************/ @@ -412,9 +412,9 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - typedef - FT_Error (*TT_CharMap_Free_Func)( TT_Face face, - TT_CMapTable* cmap ); + typedef FT_Error + (*TT_CharMap_Free_Func)( TT_Face face, + TT_CMapTable* cmap ); /*************************************************************************/ @@ -437,9 +437,9 @@ FT_BEGIN_HEADER /* The function will use `face->goto_table' to seek the stream to */ /* the start of the table. */ /* */ - typedef - FT_Error (*TT_Load_Table_Func)( TT_Face face, - FT_Stream stream ); + typedef FT_Error + (*TT_Load_Table_Func)( TT_Face face, + FT_Stream stream ); /*************************************************************************/ @@ -453,8 +453,8 @@ FT_BEGIN_HEADER /* */ /* face :: A handle to the target face object. */ /* */ - typedef - void (*TT_Free_Table_Func)( TT_Face face ); + typedef void + (*TT_Free_Table_Func)( TT_Face face ); /*************************************************************************/ diff --git a/include/freetype/internal/t1types.h b/include/freetype/internal/t1types.h index 01841f018..d40e2c49e 100644 --- a/include/freetype/internal/t1types.h +++ b/include/freetype/internal/t1types.h @@ -5,7 +5,7 @@ /* Basic Type1/Type2 type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/internal/tttypes.h b/include/freetype/internal/tttypes.h index b2eed82ee..bcaeebf84 100644 --- a/include/freetype/internal/tttypes.h +++ b/include/freetype/internal/tttypes.h @@ -5,7 +5,7 @@ /* Basic SFNT/TrueType type definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -92,7 +92,7 @@ FT_BEGIN_HEADER /* */ /* range_shift :: Must be num_tables*16 - search_range. */ /* */ - typedef struct SFNT_Header_ + typedef struct SFNT_Header_ { FT_ULong format_tag; FT_UShort num_tables; @@ -995,9 +995,9 @@ FT_BEGIN_HEADER typedef struct TT_CMapTable_ TT_CMapTable; - typedef - FT_UInt (*TT_CharMap_Func)( TT_CMapTable* charmap, - FT_ULong char_code ); + typedef FT_UInt + (*TT_CharMap_Func)( TT_CMapTable* charmap, + FT_ULong char_code ); /* charmap table */ @@ -1099,7 +1099,8 @@ FT_BEGIN_HEADER /* a function type used for the truetype bytecode interpreter hooks */ - typedef FT_Error (*TT_Interpreter)( void* exec_context ); + typedef FT_Error + (*TT_Interpreter)( void* exec_context ); /* forward declaration */ typedef struct TT_Loader_ TT_Loader; @@ -1130,11 +1131,11 @@ FT_BEGIN_HEADER /* */ /* The stream cursor must be at the font file's origin. */ /* */ - typedef - FT_Error (*TT_Goto_Table_Func)( TT_Face face, - FT_ULong tag, - FT_Stream stream, - FT_ULong* length ); + typedef FT_Error + (*TT_Goto_Table_Func)( TT_Face face, + FT_ULong tag, + FT_Stream stream, + FT_ULong* length ); /*************************************************************************/ @@ -1165,11 +1166,11 @@ FT_BEGIN_HEADER /* alternative formats (e.g. compressed ones) might use something */ /* different. */ /* */ - typedef - FT_Error (*TT_Access_Glyph_Frame_Func)( TT_Loader* loader, - FT_UInt glyph_index, - FT_ULong offset, - FT_UInt byte_count ); + typedef FT_Error + (*TT_Access_Glyph_Frame_Func)( TT_Loader* loader, + FT_UInt glyph_index, + FT_ULong offset, + FT_UInt byte_count ); /*************************************************************************/ @@ -1187,8 +1188,8 @@ FT_BEGIN_HEADER /* */ /* FreeType error code. 0 means success. */ /* */ - typedef - FT_Error (*TT_Load_Glyph_Element_Func)( TT_Loader* loader ); + typedef FT_Error + (*TT_Load_Glyph_Element_Func)( TT_Loader* loader ); /*************************************************************************/ @@ -1202,8 +1203,8 @@ FT_BEGIN_HEADER /* */ /* loader :: The current TrueType glyph loader object. */ /* */ - typedef - void (*TT_Forget_Glyph_Frame_Func)( TT_Loader* loader ); + typedef void + (*TT_Forget_Glyph_Frame_Func)( TT_Loader* loader ); diff --git a/include/freetype/t1tables.h b/include/freetype/t1tables.h index 2785fead1..9c32b92e1 100644 --- a/include/freetype/t1tables.h +++ b/include/freetype/t1tables.h @@ -5,7 +5,7 @@ /* Basic Type 1/Type 2 tables definitions and interface (specification */ /* only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -44,7 +44,7 @@ FT_BEGIN_HEADER /* including structures related to other PostScript font formats. */ /* */ /*************************************************************************/ - + /* Note that we separate font data in T1_FontInfo and T1_Private */ /* structures in order to support Multiple Master fonts. */ diff --git a/include/freetype/ttnameid.h b/include/freetype/ttnameid.h index cf9a19585..864619278 100644 --- a/include/freetype/ttnameid.h +++ b/include/freetype/ttnameid.h @@ -4,7 +4,7 @@ /* */ /* TrueType name ID definitions (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/tttables.h b/include/freetype/tttables.h index 9a4e3126a..d36425669 100644 --- a/include/freetype/tttables.h +++ b/include/freetype/tttables.h @@ -5,7 +5,7 @@ /* Basic SFNT/TrueType tables definitions and interface */ /* (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/freetype/tttags.h b/include/freetype/tttags.h index 4259c212e..df09f2a69 100644 --- a/include/freetype/tttags.h +++ b/include/freetype/tttags.h @@ -4,7 +4,7 @@ /* */ /* Tags for TrueType tables (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/include/ft2build.h b/include/ft2build.h index cd94c00fc..2ecfdeab1 100644 --- a/include/ft2build.h +++ b/include/ft2build.h @@ -5,7 +5,7 @@ /* FreeType 2 build and setup macros. */ /* (Generic version) */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/autohint/ahangles.c b/src/autohint/ahangles.c index b16fa7756..02da850cc 100644 --- a/src/autohint/ahangles.c +++ b/src/autohint/ahangles.c @@ -5,7 +5,7 @@ /* A routine used to compute vector angles with limited accuracy */ /* and very high speed (body). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahangles.h b/src/autohint/ahangles.h index 6cb69a28f..8ed62aaa8 100644 --- a/src/autohint/ahangles.h +++ b/src/autohint/ahangles.h @@ -5,7 +5,7 @@ /* A routine used to compute vector angles with limited accuracy */ /* and very high speed (specification). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahglobal.c b/src/autohint/ahglobal.c index da9e97490..4e648ac72 100644 --- a/src/autohint/ahglobal.c +++ b/src/autohint/ahglobal.c @@ -4,7 +4,7 @@ /* */ /* Routines used to compute global metrics automatically (body). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahglobal.h b/src/autohint/ahglobal.h index e2cce0e13..e9d424fb2 100644 --- a/src/autohint/ahglobal.h +++ b/src/autohint/ahglobal.h @@ -5,7 +5,7 @@ /* Routines used to compute global metrics automatically */ /* (specification). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahglyph.c b/src/autohint/ahglyph.c index cb48ec44b..390be7ef8 100644 --- a/src/autohint/ahglyph.c +++ b/src/autohint/ahglyph.c @@ -5,7 +5,7 @@ /* Routines used to load and analyze a given glyph before hinting */ /* (body). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahglyph.h b/src/autohint/ahglyph.h index 532a5bce2..3c50ee733 100644 --- a/src/autohint/ahglyph.h +++ b/src/autohint/ahglyph.h @@ -5,7 +5,7 @@ /* Routines used to load and analyze a given glyph before hinting */ /* (specification). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahhint.c b/src/autohint/ahhint.c index a8888a853..51b9fea37 100644 --- a/src/autohint/ahhint.c +++ b/src/autohint/ahhint.c @@ -4,7 +4,7 @@ /* */ /* Glyph hinter (body). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahhint.h b/src/autohint/ahhint.h index 55d81cb9b..c52760933 100644 --- a/src/autohint/ahhint.h +++ b/src/autohint/ahhint.h @@ -4,7 +4,7 @@ /* */ /* Glyph hinter (declaration). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahloader.h b/src/autohint/ahloader.h index 0f7b1731a..1f9b3a5ca 100644 --- a/src/autohint/ahloader.h +++ b/src/autohint/ahloader.h @@ -4,7 +4,7 @@ /* */ /* Glyph loader for the auto-hinting module (declaration only). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahmodule.c b/src/autohint/ahmodule.c index d16b260b4..6b6969a58 100644 --- a/src/autohint/ahmodule.c +++ b/src/autohint/ahmodule.c @@ -4,7 +4,7 @@ /* */ /* Auto-hinting module implementation (declaration). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahmodule.h b/src/autohint/ahmodule.h index f6643d2a3..43b1dbe98 100644 --- a/src/autohint/ahmodule.h +++ b/src/autohint/ahmodule.h @@ -4,7 +4,7 @@ /* */ /* Auto-hinting module (declaration). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahoptim.c b/src/autohint/ahoptim.c index e2992eab0..87c9ee5e7 100644 --- a/src/autohint/ahoptim.c +++ b/src/autohint/ahoptim.c @@ -4,7 +4,7 @@ /* */ /* FreeType auto hinting outline optimization (body). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahoptim.h b/src/autohint/ahoptim.h index 610522f48..c3e927d11 100644 --- a/src/autohint/ahoptim.h +++ b/src/autohint/ahoptim.h @@ -4,7 +4,7 @@ /* */ /* FreeType auto hinting outline optimization (declaration). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/ahtypes.h b/src/autohint/ahtypes.h index 5ef6a895a..2b7b4f072 100644 --- a/src/autohint/ahtypes.h +++ b/src/autohint/ahtypes.h @@ -5,7 +5,7 @@ /* General types and definitions for the auto-hint module */ /* (specification only). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/autohint/autohint.c b/src/autohint/autohint.c index 45ac2c27c..3783a82d9 100644 --- a/src/autohint/autohint.c +++ b/src/autohint/autohint.c @@ -4,7 +4,7 @@ /* */ /* Automatic Hinting wrapper (body only). */ /* */ -/* Copyright 2000 Catharon Productions Inc. */ +/* Copyright 2000-2001 Catharon Productions Inc. */ /* Author: David Turner */ /* */ /* This file is part of the Catharon Typography Project and shall only */ diff --git a/src/base/ftbase.c b/src/base/ftbase.c index f4b561832..e6b7869db 100644 --- a/src/base/ftbase.c +++ b/src/base/ftbase.c @@ -4,7 +4,7 @@ /* */ /* Single object library component (body only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftbbox.c b/src/base/ftbbox.c index fecb7ff30..f30b8fb61 100644 --- a/src/base/ftbbox.c +++ b/src/base/ftbbox.c @@ -4,7 +4,7 @@ /* */ /* FreeType bbox computation (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used */ diff --git a/src/base/ftcalc.c b/src/base/ftcalc.c index ea3f6bb65..54469ba66 100644 --- a/src/base/ftcalc.c +++ b/src/base/ftcalc.c @@ -4,7 +4,7 @@ /* */ /* Arithmetic computations (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftdebug.c b/src/base/ftdebug.c index 6400c317e..6a3fc498f 100644 --- a/src/base/ftdebug.c +++ b/src/base/ftdebug.c @@ -4,7 +4,7 @@ /* */ /* Debugging and logging component (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftextend.c b/src/base/ftextend.c index 2464aaa7b..cafb2844a 100644 --- a/src/base/ftextend.c +++ b/src/base/ftextend.c @@ -4,7 +4,7 @@ /* */ /* FreeType extensions implementation (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftglyph.c b/src/base/ftglyph.c index 1d978022f..c3b37e572 100644 --- a/src/base/ftglyph.c +++ b/src/base/ftglyph.c @@ -4,7 +4,7 @@ /* */ /* FreeType convenience functions to handle glyphs (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -618,7 +618,7 @@ FT_Done_Glyph( FT_GLYPH( bitmap ) ); goto Exit; } - + if ( !destroy && origin ) { FT_Vector v; diff --git a/src/base/ftinit.c b/src/base/ftinit.c index 9377b12fb..e2f809d23 100644 --- a/src/base/ftinit.c +++ b/src/base/ftinit.c @@ -4,7 +4,7 @@ /* */ /* FreeType initialization layer (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftlist.c b/src/base/ftlist.c index b9582e4af..b51691823 100644 --- a/src/base/ftlist.c +++ b/src/base/ftlist.c @@ -4,7 +4,7 @@ /* */ /* Generic list support for FreeType (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftmac.c b/src/base/ftmac.c index d310704db..005ae4f97 100644 --- a/src/base/ftmac.c +++ b/src/base/ftmac.c @@ -4,7 +4,7 @@ /* */ /* Mac FOND support. Written by just@letterror.com. */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* Just van Rossum, David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftmm.c b/src/base/ftmm.c index e320af021..229a04316 100644 --- a/src/base/ftmm.c +++ b/src/base/ftmm.c @@ -4,7 +4,7 @@ /* */ /* Multiple Master font support (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftnames.c b/src/base/ftnames.c index 97e2090b9..d38d2d507 100644 --- a/src/base/ftnames.c +++ b/src/base/ftnames.c @@ -7,7 +7,7 @@ /* */ /* This is _not_ used to retrieve glyph names! */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index a720ce9b0..e443f7e7c 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -4,7 +4,7 @@ /* */ /* The FreeType private base classes (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftoutln.c b/src/base/ftoutln.c index 87019fffc..c7e3c082c 100644 --- a/src/base/ftoutln.c +++ b/src/base/ftoutln.c @@ -4,7 +4,7 @@ /* */ /* FreeType outline management (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftstream.c b/src/base/ftstream.c index 9bee3c8ab..96683a2d9 100644 --- a/src/base/ftstream.c +++ b/src/base/ftstream.c @@ -4,7 +4,7 @@ /* */ /* I/O stream support (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftsynth.c b/src/base/ftsynth.c index b93c965bd..1bf746da7 100644 --- a/src/base/ftsynth.c +++ b/src/base/ftsynth.c @@ -4,7 +4,7 @@ /* */ /* FreeType synthesizing code for emboldening and slanting (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/ftsystem.c b/src/base/ftsystem.c index 4db722712..0bee11110 100644 --- a/src/base/ftsystem.c +++ b/src/base/ftsystem.c @@ -4,7 +4,7 @@ /* */ /* ANSI-specific FreeType low-level system interface (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/base/fttrigon.c b/src/base/fttrigon.c index 5682e8ddf..cd198030f 100644 --- a/src/base/fttrigon.c +++ b/src/base/fttrigon.c @@ -50,7 +50,7 @@ s = val; val = ( val >= 0 ) ? val : -val; - + v = ( val * (FT_Int64)FT_TRIG_SCALE ) + 0x100000000UL; val = (FT_Fixed)( v >> 32 ); @@ -65,20 +65,20 @@ { FT_Fixed s; FT_UInt32 v1, v2, k1, k2, hi, lo1, lo2, lo3; - + s = val; val = ( val >= 0 ) ? val : -val; v1 = (FT_UInt32)val >> 16; v2 = (FT_UInt32)val & 0xFFFF; - + k1 = FT_TRIG_SCALE >> 16; /* constant */ k2 = FT_TRIG_SCALE & 0xFFFF; /* constant */ hi = k1 * v1; lo1 = k1 * v2 + k2 * v1; /* can't overflow */ - + lo2 = ( k2 * v2 ) >> 16; lo3 = ( lo1 >= lo2 ) ? lo1 : lo2; lo1 += lo2; @@ -104,10 +104,10 @@ x = vec->x; y = vec->y; - + z = ( ( x >= 0 ) ? x : - x ) | ( (y >= 0) ? y : -y ); shift = 0; - + if ( z < ( 1L << 27 ) ) { do @@ -115,7 +115,7 @@ shift++; z <<= 1; } while ( z < ( 1L << 27 ) ); - + vec->x = x << shift; vec->y = y << shift; } @@ -133,7 +133,7 @@ } return shift; } - + static void ft_trig_pseudo_rotate( FT_Vector* vec, @@ -158,7 +158,7 @@ while ( theta > FT_ANGLE_PI2 ) { x = -x; - y = -y; + y = -y; theta -= FT_ANGLE_PI; } @@ -286,12 +286,12 @@ FT_Cos( FT_Angle angle ) { FT_Vector v; - + v.x = FT_TRIG_COSCALE >> 2; v.y = 0; ft_trig_pseudo_rotate( &v, angle ); - + return v.x >> 12; } @@ -311,12 +311,12 @@ FT_Tan( FT_Angle angle ) { FT_Vector v; - + v.x = FT_TRIG_COSCALE >> 2; v.y = 0; ft_trig_pseudo_rotate( &v, angle ); - + return FT_DivFix( v.y, v.x ); } @@ -328,13 +328,13 @@ FT_Fixed dy ) { FT_Vector v; - + if ( dx == 0 && dy == 0 ) return 0; v.x = dx; - v.y = dy; + v.y = dy; ft_trig_prenorm( &v ); ft_trig_pseudo_polarize( &v ); @@ -364,7 +364,7 @@ { FT_Int shift; FT_Vector v; - + v.x = vec->x; v.y = vec->y; @@ -375,7 +375,7 @@ ft_trig_pseudo_rotate( &v, angle ); v.x = ft_trig_downscale( v.x ); v.y = ft_trig_downscale( v.y ); - + if ( shift >= 0 ) { vec->x = v.x >> shift; @@ -398,11 +398,11 @@ { FT_Int shift; FT_Vector v; - + v = *vec; - /* handle trivial cases */ + /* handle trivial cases */ if ( v.x == 0 ) { return ( v.y >= 0 ) ? v.y : -v.y; @@ -415,10 +415,10 @@ /* general case */ shift = ft_trig_prenorm( &v ); ft_trig_pseudo_polarize( &v ); - + v.x = ft_trig_downscale( v.x ); return ( shift >= 0 ) ? ( v.x >> shift ) : ( v.x << -shift ); - } + } /* documentation is in fttrigon.h */ @@ -431,20 +431,20 @@ FT_Int shift; FT_Vector v; - + v = *vec; - + if ( v.x == 0 && v.y == 0 ) return; - + shift = ft_trig_prenorm( &v ); ft_trig_pseudo_polarize( &v ); - + v.x = ft_trig_downscale( v.x ); *length = ( shift >= 0 ) ? ( v.x >> shift ) : ( v.x << -shift ); *angle = v.y; - } + } /* END */ diff --git a/src/cache/ftcache.c b/src/cache/ftcache.c index 324d1b6e0..63f7f8e78 100644 --- a/src/cache/ftcache.c +++ b/src/cache/ftcache.c @@ -4,7 +4,7 @@ /* */ /* The FreeType Caching sub-system (body only). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cache/ftcchunk.c b/src/cache/ftcchunk.c index 929d4ea8c..7e603931b 100644 --- a/src/cache/ftcchunk.c +++ b/src/cache/ftcchunk.c @@ -4,7 +4,7 @@ /* */ /* FreeType chunk cache cache (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cache/ftcglyph.c b/src/cache/ftcglyph.c index 54002cae2..c524b53cb 100644 --- a/src/cache/ftcglyph.c +++ b/src/cache/ftcglyph.c @@ -4,7 +4,7 @@ /* */ /* FreeType Glyph Image (FT_Glyph) cache (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cache/ftcimage.c b/src/cache/ftcimage.c index acad0a0f5..2c93a23d9 100644 --- a/src/cache/ftcimage.c +++ b/src/cache/ftcimage.c @@ -4,7 +4,7 @@ /* */ /* FreeType Image cache (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -265,6 +265,8 @@ }; + /* documentation is in ftcimage.h */ + FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_New( FTC_Manager manager, FTC_Image_Cache *acache ) @@ -276,6 +278,8 @@ } + /* documentation is in ftcimage.h */ + FT_EXPORT_DEF( FT_Error ) FTC_Image_Cache_Lookup( FTC_Image_Cache cache, FTC_Image_Desc* desc, @@ -285,15 +289,16 @@ FT_Error error; FTC_GlyphNode node; + /* some argument checks are delayed to FTC_Glyph_Cache_Lookup */ - if (!aglyph) + if ( !aglyph ) return FTC_Err_Invalid_Argument; error = FTC_Glyph_Cache_Lookup( (FTC_Glyph_Cache)cache, desc, gindex, &node ); - - if (!error) + + if ( !error ) *aglyph = ((FTC_GlyphImage)node)->ft_glyph; return error; diff --git a/src/cache/ftcmanag.c b/src/cache/ftcmanag.c index 933400a42..12f6257bf 100644 --- a/src/cache/ftcmanag.c +++ b/src/cache/ftcmanag.c @@ -4,7 +4,7 @@ /* */ /* FreeType Cache Manager (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -212,6 +212,8 @@ }; + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( FT_Error ) FTC_Manager_New( FT_Library library, FT_UInt max_faces, @@ -279,6 +281,8 @@ } + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( void ) FTC_Manager_Done( FTC_Manager manager ) { @@ -308,7 +312,7 @@ /* discard faces and sizes */ FT_Lru_Done( manager->faces_lru ); manager->faces_lru = 0; - + FT_Lru_Done( manager->sizes_lru ); manager->sizes_lru = 0; @@ -316,6 +320,8 @@ } + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( void ) FTC_Manager_Reset( FTC_Manager manager ) { @@ -328,6 +334,8 @@ } + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Face( FTC_Manager manager, FTC_FaceID face_id, @@ -342,6 +350,8 @@ } + /* documentation is in ftcache.h */ + FT_EXPORT_DEF( FT_Error ) FTC_Manager_Lookup_Size( FTC_Manager manager, FTC_Font font, @@ -390,6 +400,9 @@ /* `Compress' the manager's data, i.e., get rid of old cache nodes */ /* that are not referenced anymore in order to limit the total */ /* memory used by the cache. */ + + /* documentation is in ftcmanag.h */ + FT_EXPORT_DEF( void ) FTC_Manager_Compress( FTC_Manager manager ) { diff --git a/src/cache/ftcsbits.c b/src/cache/ftcsbits.c index 905f2daec..4b7d25da9 100644 --- a/src/cache/ftcsbits.c +++ b/src/cache/ftcsbits.c @@ -4,7 +4,7 @@ /* */ /* FreeType sbits manager (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -252,7 +252,7 @@ /* the node itself */ size = sizeof ( *node ); - + /* the sbit records */ size += cset->element_count * sizeof ( FTC_SBitRec ); @@ -358,6 +358,8 @@ }; + /* documentation is in ftcsbits.h */ + FT_EXPORT_DEF( FT_Error ) FTC_SBit_Cache_New( FTC_Manager manager, FTC_SBit_Cache *acache ) @@ -369,6 +371,8 @@ } + /* documentation is in ftcsbits.h */ + FT_EXPORT_DEF( FT_Error ) FTC_SBit_Cache_Lookup( FTC_SBit_Cache cache, FTC_Image_Desc* desc, @@ -383,15 +387,15 @@ /* argument checks delayed to FTC_Chunk_Cache_Lookup */ if ( !ansbit ) return FTC_Err_Invalid_Argument; - + *ansbit = 0; error = FTC_Chunk_Cache_Lookup( &cache->root, desc, gindex, &node, &cindex ); if ( !error ) *ansbit = (FTC_SBit)node->elements + cindex; - + return error; } - + /* END */ diff --git a/src/cache/ftlru.c b/src/cache/ftlru.c index 37c7dd4e7..7b9254566 100644 --- a/src/cache/ftlru.c +++ b/src/cache/ftlru.c @@ -4,7 +4,7 @@ /* */ /* Simple LRU list-cache (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cff.c b/src/cff/cff.c index 6ac61f767..19883f2eb 100644 --- a/src/cff/cff.c +++ b/src/cff/cff.c @@ -4,7 +4,7 @@ /* */ /* FreeType OpenType driver component (body only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cffdrivr.c b/src/cff/cffdrivr.c index b8013db95..19ec5dbc1 100644 --- a/src/cff/cffdrivr.c +++ b/src/cff/cffdrivr.c @@ -4,7 +4,7 @@ /* */ /* OpenType font driver implementation (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cffdrivr.h b/src/cff/cffdrivr.h index 846e0b1b5..8fd224734 100644 --- a/src/cff/cffdrivr.h +++ b/src/cff/cffdrivr.h @@ -4,7 +4,7 @@ /* */ /* High-level OpenType driver interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cffgload.c b/src/cff/cffgload.c index 03ef03af4..508f2fadf 100644 --- a/src/cff/cffgload.c +++ b/src/cff/cffgload.c @@ -4,7 +4,7 @@ /* */ /* OpenType Glyph Loader (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -2198,7 +2198,7 @@ if ( load_flags & FT_LOAD_NO_RECURSE ) { FT_Slot_Internal internal = glyph->root.internal; - + glyph->root.metrics.horiBearingX = decoder.builder.left_bearing.x; glyph->root.metrics.horiAdvance = decoder.glyph_width; diff --git a/src/cff/cffgload.h b/src/cff/cffgload.h index 3df21100d..187ed707b 100644 --- a/src/cff/cffgload.h +++ b/src/cff/cffgload.h @@ -4,7 +4,7 @@ /* */ /* OpenType Glyph Loader (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cffload.c b/src/cff/cffload.c index 0ae090930..bc8cf410d 100644 --- a/src/cff/cffload.c +++ b/src/cff/cffload.c @@ -4,7 +4,7 @@ /* */ /* OpenType and CFF data/program tables loader (body) */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -1615,7 +1615,7 @@ goto Exit; /* Copy the predefined charset into the allocated memory. */ - MEM_Copy( charset->sids, cff_isoadobe_charset, + MEM_Copy( charset->sids, cff_isoadobe_charset, num_glyphs * sizeof ( FT_UShort ) ); break; @@ -2210,7 +2210,7 @@ base_offset, dict->charset_offset ); if ( error ) goto Exit; - + error = CFF_Load_Encoding( &font->encoding, &font->charset, font->num_glyphs, @@ -2219,7 +2219,7 @@ dict->encoding_offset ); if ( error ) goto Exit; - + /* get the font name */ font->font_name = CFF_Get_Name( &font->name_index, face_index ); diff --git a/src/cff/cffload.h b/src/cff/cffload.h index 273bde254..90e894bac 100644 --- a/src/cff/cffload.h +++ b/src/cff/cffload.h @@ -4,7 +4,7 @@ /* */ /* OpenType & CFF data/program tables loader (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cffobjs.c b/src/cff/cffobjs.c index 3e83da0c0..1041ec284 100644 --- a/src/cff/cffobjs.c +++ b/src/cff/cffobjs.c @@ -4,7 +4,7 @@ /* */ /* OpenType objects manager (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cffobjs.h b/src/cff/cffobjs.h index 851ba9e7e..10b2e6148 100644 --- a/src/cff/cffobjs.h +++ b/src/cff/cffobjs.h @@ -4,7 +4,7 @@ /* */ /* OpenType objects manager (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cffparse.c b/src/cff/cffparse.c index 459beadaf..287545a38 100644 --- a/src/cff/cffparse.c +++ b/src/cff/cffparse.c @@ -4,7 +4,7 @@ /* */ /* CFF token stream parser (body) */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cffparse.h b/src/cff/cffparse.h index ef068ba9b..c40b1983e 100644 --- a/src/cff/cffparse.h +++ b/src/cff/cffparse.h @@ -4,7 +4,7 @@ /* */ /* CFF token stream parser (specification) */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cff/cfftoken.h b/src/cff/cfftoken.h index ab4fd8ee2..e58cef308 100644 --- a/src/cff/cfftoken.h +++ b/src/cff/cfftoken.h @@ -4,7 +4,7 @@ /* */ /* CFF token definitions */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c index 69794addb..c1c4f45ae 100644 --- a/src/cid/cidgload.c +++ b/src/cid/cidgload.c @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 Glyph Loader (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -265,8 +265,8 @@ if ( load_flags & FT_LOAD_NO_RECURSE ) { FT_Slot_Internal internal = glyph->root.internal; - - + + glyph->root.metrics.horiBearingX = decoder.builder.left_bearing.x; glyph->root.metrics.horiAdvance = decoder.builder.advance.x; diff --git a/src/cid/cidgload.h b/src/cid/cidgload.h index 8f0ce3409..bfab08122 100644 --- a/src/cid/cidgload.h +++ b/src/cid/cidgload.h @@ -4,7 +4,7 @@ /* */ /* OpenType Glyph Loader (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidload.c b/src/cid/cidload.c index b67df5fc3..77b6995ae 100644 --- a/src/cid/cidload.c +++ b/src/cid/cidload.c @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 font loader (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidload.h b/src/cid/cidload.h index 55a5609bf..0b70657d6 100644 --- a/src/cid/cidload.h +++ b/src/cid/cidload.h @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 font loader (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidobjs.c b/src/cid/cidobjs.c index 0369efadf..77c25edab 100644 --- a/src/cid/cidobjs.c +++ b/src/cid/cidobjs.c @@ -4,7 +4,7 @@ /* */ /* CID objects manager (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidobjs.h b/src/cid/cidobjs.h index db5d2f60f..8330663e3 100644 --- a/src/cid/cidobjs.h +++ b/src/cid/cidobjs.h @@ -4,7 +4,7 @@ /* */ /* CID objects manager (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidparse.c b/src/cid/cidparse.c index a8c79c4ba..f87e09d31 100644 --- a/src/cid/cidparse.c +++ b/src/cid/cidparse.c @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 parser (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidparse.h b/src/cid/cidparse.h index 04bba3d89..a2bd1fa44 100644 --- a/src/cid/cidparse.h +++ b/src/cid/cidparse.h @@ -4,7 +4,7 @@ /* */ /* CID-keyed Type1 parser (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidriver.c b/src/cid/cidriver.c index 432c8a950..33a39d81b 100644 --- a/src/cid/cidriver.c +++ b/src/cid/cidriver.c @@ -4,7 +4,7 @@ /* */ /* CID driver interface (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidriver.h b/src/cid/cidriver.h index 134cbb59b..33e8481c8 100644 --- a/src/cid/cidriver.h +++ b/src/cid/cidriver.h @@ -4,7 +4,7 @@ /* */ /* High-level CID driver interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/cidtoken.h b/src/cid/cidtoken.h index 5a3981e43..487355d9d 100644 --- a/src/cid/cidtoken.h +++ b/src/cid/cidtoken.h @@ -4,7 +4,7 @@ /* */ /* CID token definitions (specification only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/cid/type1cid.c b/src/cid/type1cid.c index 852eca18c..0b866e97c 100644 --- a/src/cid/type1cid.c +++ b/src/cid/type1cid.c @@ -4,7 +4,7 @@ /* */ /* FreeType OpenType driver component (body only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/pcf/pcf.c b/src/pcf/pcf.c index 9a4967a24..315655e56 100644 --- a/src/pcf/pcf.c +++ b/src/pcf/pcf.c @@ -2,7 +2,7 @@ FreeType font driver for pcf fonts - Copyright 2000 by + Copyright 2000-2001 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/pcf/pcf.h b/src/pcf/pcf.h index a8fba505b..3941b6a3f 100644 --- a/src/pcf/pcf.h +++ b/src/pcf/pcf.h @@ -2,7 +2,7 @@ FreeType font driver for pcf fonts - Copyright (C) 2000 by + Copyright (C) 2000-2001 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/pcf/pcfdriver.c b/src/pcf/pcfdriver.c index 17d30c1e5..6c34524fe 100644 --- a/src/pcf/pcfdriver.c +++ b/src/pcf/pcfdriver.c @@ -2,7 +2,7 @@ FreeType font driver for pcf files - Copyright (C) 2000 by + Copyright (C) 2000-2001 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/pcf/pcfdriver.h b/src/pcf/pcfdriver.h index 9baad1b52..c59990a71 100644 --- a/src/pcf/pcfdriver.h +++ b/src/pcf/pcfdriver.h @@ -2,7 +2,7 @@ FreeType font driver for pcf fonts - Copyright 2000 by + Copyright 2000-2001 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c index 36a8746d5..4e25df35c 100644 --- a/src/pcf/pcfread.c +++ b/src/pcf/pcfread.c @@ -2,7 +2,7 @@ FreeType font driver for pcf fonts - Copyright 2000 by + Copyright 2000-2001 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/pcf/pcfutil.h b/src/pcf/pcfutil.h index 383823cbc..32dd1eab7 100644 --- a/src/pcf/pcfutil.h +++ b/src/pcf/pcfutil.h @@ -2,7 +2,7 @@ FreeType font driver for pcf fonts - Copyright 2000 by + Copyright 2000-2001 by Francesco Zappa Nardelli Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/src/psaux/psaux.c b/src/psaux/psaux.c index 9275e0213..54d85e587 100644 --- a/src/psaux/psaux.c +++ b/src/psaux/psaux.c @@ -4,7 +4,7 @@ /* */ /* FreeType auxiliary PostScript driver component (body only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/psaux/psauxmod.c b/src/psaux/psauxmod.c index f752372c2..559f9d036 100644 --- a/src/psaux/psauxmod.c +++ b/src/psaux/psauxmod.c @@ -4,7 +4,7 @@ /* */ /* FreeType auxiliary PostScript module implementation (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/psaux/psauxmod.h b/src/psaux/psauxmod.h index f71d548ca..92ac05604 100644 --- a/src/psaux/psauxmod.h +++ b/src/psaux/psauxmod.h @@ -4,7 +4,7 @@ /* */ /* FreeType auxiliary PostScript module implementation (specification). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/psaux/psobjs.h b/src/psaux/psobjs.h index be7209796..a3ae8f8a9 100644 --- a/src/psaux/psobjs.h +++ b/src/psaux/psobjs.h @@ -4,7 +4,7 @@ /* */ /* Auxiliary functions for PostScript fonts (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/psaux/t1decode.c b/src/psaux/t1decode.c index 7e5613e30..6139ed3ff 100644 --- a/src/psaux/t1decode.c +++ b/src/psaux/t1decode.c @@ -4,7 +4,7 @@ /* */ /* PostScript Type 1 decoding routines (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/psaux/t1decode.h b/src/psaux/t1decode.h index a1a4fc1e0..14dc043f2 100644 --- a/src/psaux/t1decode.h +++ b/src/psaux/t1decode.h @@ -4,7 +4,7 @@ /* */ /* PostScript Type 1 decoding routines (specification). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/psnames/psmodule.c b/src/psnames/psmodule.c index 10624a757..eaf4aa496 100644 --- a/src/psnames/psmodule.c +++ b/src/psnames/psmodule.c @@ -4,7 +4,7 @@ /* */ /* PSNames module implementation (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/psnames/psmodule.h b/src/psnames/psmodule.h index 8694ca8b5..232fdfb9a 100644 --- a/src/psnames/psmodule.h +++ b/src/psnames/psmodule.h @@ -4,7 +4,7 @@ /* */ /* High-level PSNames module interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/psnames/psnames.c b/src/psnames/psnames.c index 6e482ff2e..d6ed998bf 100644 --- a/src/psnames/psnames.c +++ b/src/psnames/psnames.c @@ -4,7 +4,7 @@ /* */ /* FreeType PSNames module component (body only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/psnames/pstables.h b/src/psnames/pstables.h index 9fbe50b05..37b30d077 100644 --- a/src/psnames/pstables.h +++ b/src/psnames/pstables.h @@ -4,7 +4,7 @@ /* */ /* PostScript glyph names (specification only). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/raster/ftraster.c b/src/raster/ftraster.c index c8ab64202..3625d22f5 100644 --- a/src/raster/ftraster.c +++ b/src/raster/ftraster.c @@ -4,7 +4,7 @@ /* */ /* The FreeType glyph rasterizer (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/raster/ftraster.h b/src/raster/ftraster.h index 46985e6c3..80fe46deb 100644 --- a/src/raster/ftraster.h +++ b/src/raster/ftraster.h @@ -4,7 +4,7 @@ /* */ /* The FreeType glyph rasterizer (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used */ diff --git a/src/raster/ftrend1.c b/src/raster/ftrend1.c index 8acfeeb1a..5a2912554 100644 --- a/src/raster/ftrend1.c +++ b/src/raster/ftrend1.c @@ -4,7 +4,7 @@ /* */ /* The FreeType glyph rasterizer interface (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/raster/ftrend1.h b/src/raster/ftrend1.h index c22779e0c..76e9a5f58 100644 --- a/src/raster/ftrend1.h +++ b/src/raster/ftrend1.h @@ -4,7 +4,7 @@ /* */ /* The FreeType glyph rasterizer interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/raster/raster.c b/src/raster/raster.c index 9dc2a86fb..f13a67a20 100644 --- a/src/raster/raster.c +++ b/src/raster/raster.c @@ -4,7 +4,7 @@ /* */ /* FreeType monochrome rasterer module component (body only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/sfnt/sfdriver.c b/src/sfnt/sfdriver.c index 723cc6b67..086bcccc4 100644 --- a/src/sfnt/sfdriver.c +++ b/src/sfnt/sfdriver.c @@ -4,7 +4,7 @@ /* */ /* High-level SFNT driver interface (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/sfnt/sfdriver.h b/src/sfnt/sfdriver.h index c2b9a9d53..92db79694 100644 --- a/src/sfnt/sfdriver.h +++ b/src/sfnt/sfdriver.h @@ -4,7 +4,7 @@ /* */ /* High-level SFNT driver interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/sfnt/sfnt.c b/src/sfnt/sfnt.c index bab7b57c4..b1e412b7a 100644 --- a/src/sfnt/sfnt.c +++ b/src/sfnt/sfnt.c @@ -4,7 +4,7 @@ /* */ /* Single object library component. */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c index cbbd649d2..36f1dc4be 100644 --- a/src/sfnt/sfobjs.c +++ b/src/sfnt/sfobjs.c @@ -4,7 +4,7 @@ /* */ /* SFNT object management (base). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -280,7 +280,7 @@ has_outline = FT_BOOL( ( TT_LookUp_Table( face, TTAG_glyf ) != 0 ) || ( TT_LookUp_Table( face, TTAG_CFF ) != 0 ) ); is_apple_sbit = 0; - + #ifdef TT_CONFIG_OPTION_EMBEDDED_BITMAPS /* if this font doesn't contain outlines, we try to load */ @@ -310,12 +310,12 @@ error = sfnt->load_metrics( face, stream, 0 ); if ( error ) goto Exit; - + /* try to load the `vhea' and `vmtx' tables at once */ error = sfnt->load_metrics( face, stream, 1 ); if ( error ) goto Exit; - + if ( LOAD_( os2 ) ) goto Exit; } diff --git a/src/sfnt/sfobjs.h b/src/sfnt/sfobjs.h index 154bc0c97..463f0b62f 100644 --- a/src/sfnt/sfobjs.h +++ b/src/sfnt/sfobjs.h @@ -4,7 +4,7 @@ /* */ /* SFNT object management (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/sfnt/ttcmap.c b/src/sfnt/ttcmap.c index 710b5d5aa..d1f6d92ef 100644 --- a/src/sfnt/ttcmap.c +++ b/src/sfnt/ttcmap.c @@ -4,7 +4,7 @@ /* */ /* TrueType character mapping table (cmap) support (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -37,7 +37,7 @@ FT_CALLBACK_DEF( FT_UInt ) code_to_index0( TT_CMapTable* charmap, FT_ULong char_code ); - + FT_CALLBACK_DEF( FT_UInt ) code_to_index2( TT_CMapTable* charmap, FT_ULong char_code ); diff --git a/src/sfnt/ttcmap.h b/src/sfnt/ttcmap.h index 86963bf17..2dea02e74 100644 --- a/src/sfnt/ttcmap.h +++ b/src/sfnt/ttcmap.h @@ -4,7 +4,7 @@ /* */ /* TrueType character mapping table (cmap) support (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/sfnt/ttload.c b/src/sfnt/ttload.c index 39bf20a0a..ae72f37a8 100644 --- a/src/sfnt/ttload.c +++ b/src/sfnt/ttload.c @@ -5,7 +5,7 @@ /* Load the basic TrueType tables, i.e., tables that can be either in */ /* TTF or OTF fonts (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -1616,13 +1616,13 @@ face->num_kern_pairs = num_pairs; face->kern_table_index = n; - + /* ensure that the kerning pair table is sorted (yes, some */ /* fonts have unsorted tables!) */ { FT_UInt i; TT_Kern_0_Pair* pair0; - + pair0 = face->kern_pairs; @@ -1636,7 +1636,7 @@ } } } - + goto Exit; } diff --git a/src/sfnt/ttload.h b/src/sfnt/ttload.h index 67d65b1e7..2e67e036c 100644 --- a/src/sfnt/ttload.h +++ b/src/sfnt/ttload.h @@ -5,7 +5,7 @@ /* Load the basic TrueType tables, i.e., tables that can be either in */ /* TTF or OTF fonts (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/sfnt/ttpost.c b/src/sfnt/ttpost.c index d6cd218ee..c22870692 100644 --- a/src/sfnt/ttpost.c +++ b/src/sfnt/ttpost.c @@ -5,7 +5,7 @@ /* Postcript name table processing for TrueType and OpenType fonts */ /* (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/sfnt/ttpost.h b/src/sfnt/ttpost.h index 880235612..2c3012228 100644 --- a/src/sfnt/ttpost.h +++ b/src/sfnt/ttpost.h @@ -5,7 +5,7 @@ /* Postcript name table processing for TrueType and OpenType fonts */ /* (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/sfnt/ttsbit.c b/src/sfnt/ttsbit.c index 5293bac4b..cb007a179 100644 --- a/src/sfnt/ttsbit.c +++ b/src/sfnt/ttsbit.c @@ -4,7 +4,7 @@ /* */ /* TrueType and OpenType embedded bitmap support (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -622,7 +622,7 @@ face->num_sbit_strikes = 0; } - + FT_LOCAL_DEF FT_Error TT_Set_SBit_Strike( TT_Face face, FT_Int x_ppem, @@ -794,7 +794,7 @@ TT_SBit_Strike* strike; - if ( !face->sbit_strikes || + if ( !face->sbit_strikes || ( face->num_sbit_strikes <= (FT_Int)strike_index ) ) goto Fail; diff --git a/src/sfnt/ttsbit.h b/src/sfnt/ttsbit.h index cc5893056..2e0c23627 100644 --- a/src/sfnt/ttsbit.h +++ b/src/sfnt/ttsbit.h @@ -4,7 +4,7 @@ /* */ /* TrueType and OpenType embedded bitmap support (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c index 62d601997..199757033 100644 --- a/src/smooth/ftgrays.c +++ b/src/smooth/ftgrays.c @@ -4,7 +4,7 @@ /* */ /* A new `perfect' anti-aliasing renderer (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -1364,7 +1364,7 @@ if ( ras.num_cells == 0 ) return; - + cur = ras.cells; limit = cur + ras.num_cells; @@ -1716,7 +1716,7 @@ /* clip to target bitmap, exit if nothing to do */ clip = &ras.clip_box; - + if ( ras.max_ex <= clip->xMin || ras.min_ex >= clip->xMax || ras.max_ey <= clip->yMin || ras.min_ey >= clip->yMax ) return 0; diff --git a/src/smooth/ftgrays.h b/src/smooth/ftgrays.h index 82492b59a..2d409543d 100644 --- a/src/smooth/ftgrays.h +++ b/src/smooth/ftgrays.h @@ -4,7 +4,7 @@ /* */ /* FreeType smooth renderer declaration */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/smooth/ftsmooth.c b/src/smooth/ftsmooth.c index 6227c2911..735ef226d 100644 --- a/src/smooth/ftsmooth.c +++ b/src/smooth/ftsmooth.c @@ -4,7 +4,7 @@ /* */ /* Anti-aliasing renderer interface (body). */ /* */ -/* Copyright 2000 by */ +/* Copyright 2000-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/smooth/ftsmooth.h b/src/smooth/ftsmooth.h index 64b24d00c..ec011219b 100644 --- a/src/smooth/ftsmooth.h +++ b/src/smooth/ftsmooth.h @@ -4,7 +4,7 @@ /* */ /* Anti-aliasing renderer interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/smooth/smooth.c b/src/smooth/smooth.c index 40639cb0e..ff6be3e40 100644 --- a/src/smooth/smooth.c +++ b/src/smooth/smooth.c @@ -4,7 +4,7 @@ /* */ /* FreeType anti-aliasing rasterer module component (body only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/tools/test_bbox.c b/src/tools/test_bbox.c index ec97a3899..5ac989433 100644 --- a/src/tools/test_bbox.c +++ b/src/tools/test_bbox.c @@ -22,12 +22,12 @@ /* test bbox computations */ - + #define XSCALE 65536 #define XX(x) ((FT_Pos)(x*XSCALE)) #define XVEC(x,y) { XX(x), XX(y) } #define XVAL(x) ((x)/(1.0*XSCALE)) - + /* dummy outline #1 */ static FT_Vector dummy_vec_1[4] = { @@ -36,14 +36,14 @@ XVEC( 455.8887, 634.396 ), XVEC( -37.8765, 786.2207 ), XVEC( 164.6074, 535.3164 ) -#else +#else { (FT_Int32)0x0198E93DL , (FT_Int32)0x021750FFL }, /* 408.9111, 535.3164 */ { (FT_Int32)0x01C7E312L , (FT_Int32)0x027A6560L }, /* 455.8887, 634.3960 */ { (FT_Int32)0xFFDA1F9EL , (FT_Int32)0x0312387FL }, /* -37.8765, 786.2207 */ { (FT_Int32)0x00A49B7EL , (FT_Int32)0x021750FFL } /* 164.6074, 535.3164 */ -#endif +#endif }; - + static char dummy_tag_1[4] = { FT_Curve_Tag_On, @@ -56,7 +56,7 @@ { 3 }; - + static FT_Outline dummy_outline_1 = { 1, @@ -76,7 +76,7 @@ XVEC( 200.0, 200.0 ), XVEC( 200.0, 133.0 ) }; - + static FT_Outline dummy_outline_2 = { 1, @@ -92,7 +92,7 @@ dump_outline( FT_Outline* outline ) { FT_BBox bbox; - + /* compute and display cbox */ FT_Outline_Get_CBox( outline, &bbox ); printf( "cbox = [%.2f %.2f %.2f %.2f]\n", @@ -119,12 +119,12 @@ FT_BBox bbox; long count; long time0; - + time0 = get_time(); for ( count = repeat; count > 0; count-- ) FT_Outline_Get_CBox( outline, &bbox ); - - time0 = get_time() - time0; + + time0 = get_time() - time0; printf( "time = %5.2f cbox = [%.2f %.2f %.2f %.2f]\n", ((double)time0/10000.0), XVAL( bbox.xMin ), @@ -136,7 +136,7 @@ time0 = get_time(); for ( count = repeat; count > 0; count-- ) FT_Outline_Get_BBox( outline, &bbox ); - + time0 = get_time() - time0; printf( "time = %5.2f bbox = [%.2f %.2f %.2f %.2f]\n", ((double)time0/10000.0), diff --git a/src/tools/test_trig.c b/src/tools/test_trig.c index e3399e7a6..8c8a544aa 100644 --- a/src/tools/test_trig.c +++ b/src/tools/test_trig.c @@ -21,7 +21,7 @@ FT_Fixed f1, f2; double d1, d2; int i; - + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) { f1 = FT_Cos(i); @@ -46,7 +46,7 @@ FT_Fixed f1, f2; double d1, d2; int i; - + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) { f1 = FT_Sin(i); @@ -70,7 +70,7 @@ FT_Fixed f1, f2; double d1, d2; int i; - + for ( i = 0; i < FT_ANGLE_PI2-0x2000000; i += 0x10000 ) { f1 = FT_Tan(i); @@ -94,22 +94,22 @@ FT_Fixed c2, s2; double l, a, c1, s1; int i, j; - + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) { l = 5.0; a = i*SPI; - + c1 = l * cos(a); s1 = l * sin(a); - + c2 = (FT_Fixed)(c1*65536.0); s2 = (FT_Fixed)(s1*65536.0); - + j = FT_Atan2( c2, s2 ); if ( j < 0 ) j += FT_ANGLE_2PI; - + if ( abs( i - j ) > 1 ) { printf( "FT_Atan2( %.7f, %.7f ) = %.5f, atan = %.5f\n", @@ -117,7 +117,7 @@ } } } - + static void test_unit( void ) { @@ -125,7 +125,7 @@ double a, c1, s1; FT_Fixed c2, s2; int i; - + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) { FT_Vector_Unit( &v, i ); @@ -134,7 +134,7 @@ s1 = sin(a); c2 = (FT_Fixed)(c1*65536.0); s2 = (FT_Fixed)(s1*65536.0); - + if ( abs( v.x-c2 ) > THRESHOLD || abs( v.y-s2 ) > THRESHOLD ) { @@ -146,7 +146,7 @@ } } } - + static void test_length( void ) @@ -154,14 +154,14 @@ FT_Vector v; FT_Fixed l, l2; int i; - + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) { l = (FT_Fixed)(500.0*65536.0); v.x = (FT_Fixed)( l * cos( i*SPI ) ); v.y = (FT_Fixed)( l * sin( i*SPI ) ); l2 = FT_Vector_Length( &v ); - + if ( abs( l2-l ) > THRESHOLD ) { error = 1; @@ -179,32 +179,32 @@ FT_Vector v; double l, ra, a, c1, s1, cra, sra, c3, s3; int i, j, rotate; - + for ( rotate = 0; rotate < FT_ANGLE_2PI; rotate += 0x10000 ) { ra = rotate*SPI; cra = cos( ra ); sra = sin( ra ); - + for ( i = 0; i < FT_ANGLE_2PI; i += 0x10000 ) { l = 500.0; a = i*SPI; - + c1 = l * cos(a); s1 = l * sin(a); - + v.x = c2 = (FT_Fixed)(c1*65536.0); v.y = s2 = (FT_Fixed)(s1*65536.0); - + FT_Vector_Rotate( &v, rotate ); - + c3 = c1 * cra - s1 * sra; s3 = c1 * sra + s1 * cra; - + c4 = (FT_Fixed)(c3*65536.0); s4 = (FT_Fixed)(s3*65536.0); - + if ( abs( c4 - v.x ) > THRESHOLD || abs( s4 - v.y ) > THRESHOLD ) { @@ -218,7 +218,7 @@ } } - + int main( void ) { test_cos(); @@ -228,9 +228,9 @@ test_unit(); test_length(); test_rotate(); - + if (!error) printf( "trigonometry test ok !\n" ); - + return !error; } diff --git a/src/truetype/truetype.c b/src/truetype/truetype.c index 59833e5e3..1ed3cebc9 100644 --- a/src/truetype/truetype.c +++ b/src/truetype/truetype.c @@ -4,7 +4,7 @@ /* */ /* FreeType TrueType driver component (body only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c index b888523bf..85b9d6ae8 100644 --- a/src/truetype/ttdriver.c +++ b/src/truetype/ttdriver.c @@ -4,7 +4,7 @@ /* */ /* TrueType font driver implementation (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/truetype/ttdriver.h b/src/truetype/ttdriver.h index c33ff7697..7c6f95ee0 100644 --- a/src/truetype/ttdriver.h +++ b/src/truetype/ttdriver.h @@ -4,7 +4,7 @@ /* */ /* High-level TrueType driver interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/truetype/ttgload.c b/src/truetype/ttgload.c index ada45a34d..6558f61f8 100644 --- a/src/truetype/ttgload.c +++ b/src/truetype/ttgload.c @@ -4,7 +4,7 @@ /* */ /* TrueType Glyph Loader (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/truetype/ttgload.h b/src/truetype/ttgload.h index f09efbf4b..ef0a4d7a1 100644 --- a/src/truetype/ttgload.h +++ b/src/truetype/ttgload.h @@ -4,7 +4,7 @@ /* */ /* TrueType Glyph Loader (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 0dc16401f..8ad09a769 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -4,7 +4,7 @@ /* */ /* TrueType bytecode interpreter (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -850,11 +850,11 @@ FT_F26Dot6 Y ) { FT_Vector v; - + v.x = X; v.y = Y; return FT_Vector_Length( &v ); - } + } #endif /* FT_CONFIG_OPTION_OLD_CALCS */ @@ -2293,14 +2293,14 @@ { FT_Vector v; FT_Angle angle; - + angle = FT_Atan2( Vx, Vy ); FT_Vector_Unit( &v, angle ); - + R->x = v.x >> 2; R->y = v.y >> 2; - + return SUCCESS; } diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h index 0b995089a..a7afaa892 100644 --- a/src/truetype/ttinterp.h +++ b/src/truetype/ttinterp.h @@ -4,7 +4,7 @@ /* */ /* TrueType bytecode interpreter (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/truetype/ttobjs.c b/src/truetype/ttobjs.c index cd00a96b4..7fee693e8 100644 --- a/src/truetype/ttobjs.c +++ b/src/truetype/ttobjs.c @@ -4,7 +4,7 @@ /* */ /* Objects manager (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -699,8 +699,8 @@ if ( !error ) { TT_SBit_Strike* strike = face->sbit_strikes + strike_index; - - + + sbit_metrics->x_ppem = metrics->x_ppem; sbit_metrics->y_ppem = metrics->y_ppem; #if 0 @@ -711,14 +711,14 @@ sbit_metrics->x_scale = 1 << 16; sbit_metrics->y_scale = 1 << 16; #endif - + sbit_metrics->ascender = strike->hori.ascender << 6; sbit_metrics->descender = strike->hori.descender << 6; - + /* XXX: Is this correct? */ sbit_metrics->height = sbit_metrics->ascender - sbit_metrics->descender; - + /* XXX: Is this correct? */ sbit_metrics->max_advance = ( strike->hori.min_origin_SB + strike->hori.max_width + @@ -729,7 +729,7 @@ else { size->strike_index = 0xFFFF; - + sbit_metrics->x_ppem = 0; sbit_metrics->y_ppem = 0; sbit_metrics->ascender = 0; diff --git a/src/truetype/ttobjs.h b/src/truetype/ttobjs.h index 0a2d1d1dd..d780ce420 100644 --- a/src/truetype/ttobjs.h +++ b/src/truetype/ttobjs.h @@ -4,7 +4,7 @@ /* */ /* Objects manager (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c index ba6f2b4c2..478c67b0f 100644 --- a/src/truetype/ttpload.c +++ b/src/truetype/ttpload.c @@ -4,7 +4,7 @@ /* */ /* TrueType glyph data/program tables loader (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/truetype/ttpload.h b/src/truetype/ttpload.h index d307e9168..83b0b3a29 100644 --- a/src/truetype/ttpload.h +++ b/src/truetype/ttpload.h @@ -4,7 +4,7 @@ /* */ /* TrueType glyph data/program tables loader (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1afm.c b/src/type1/t1afm.c index 89bc7dc9f..0de560e11 100644 --- a/src/type1/t1afm.c +++ b/src/type1/t1afm.c @@ -4,7 +4,7 @@ /* */ /* AFM support for Type 1 fonts (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1afm.h b/src/type1/t1afm.h index e3003ff9c..a82875375 100644 --- a/src/type1/t1afm.h +++ b/src/type1/t1afm.h @@ -4,7 +4,7 @@ /* */ /* AFM support for Type 1 fonts (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1driver.c b/src/type1/t1driver.c index 4277d51c7..931c13e74 100644 --- a/src/type1/t1driver.c +++ b/src/type1/t1driver.c @@ -4,7 +4,7 @@ /* */ /* Type 1 driver interface (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1driver.h b/src/type1/t1driver.h index e33c068c7..ce508003e 100644 --- a/src/type1/t1driver.h +++ b/src/type1/t1driver.h @@ -4,7 +4,7 @@ /* */ /* High-level Type 1 driver interface (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c index 442915418..f23b2cdb9 100644 --- a/src/type1/t1gload.c +++ b/src/type1/t1gload.c @@ -4,7 +4,7 @@ /* */ /* Type 1 Glyph Loader (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ @@ -208,8 +208,8 @@ if ( load_flags & FT_LOAD_NO_RECURSE ) { FT_Slot_Internal internal = glyph->root.internal; - - + + glyph->root.metrics.horiBearingX = decoder.builder.left_bearing.x; glyph->root.metrics.horiAdvance = decoder.builder.advance.x; internal->glyph_matrix = font_matrix; @@ -299,7 +299,7 @@ metrics->horiBearingX = cbox.xMin; metrics->horiBearingY = cbox.yMax; } - + /* Set control data to the glyph charstrings. Note that this is */ /* _not_ zero-terminated. */ glyph->root.control_data = type1->charstrings [glyph_index]; diff --git a/src/type1/t1gload.h b/src/type1/t1gload.h index e9f3f9dcf..d1960e579 100644 --- a/src/type1/t1gload.h +++ b/src/type1/t1gload.h @@ -4,7 +4,7 @@ /* */ /* Type 1 Glyph Loader (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1load.c b/src/type1/t1load.c index bfc7985d5..ce1b23b06 100644 --- a/src/type1/t1load.c +++ b/src/type1/t1load.c @@ -4,7 +4,7 @@ /* */ /* Type 1 font loader (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1load.h b/src/type1/t1load.h index b4ff450c4..23082bc5d 100644 --- a/src/type1/t1load.h +++ b/src/type1/t1load.h @@ -4,7 +4,7 @@ /* */ /* Type 1 font loader (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1objs.c b/src/type1/t1objs.c index 04975c1a9..9eaadcc0e 100644 --- a/src/type1/t1objs.c +++ b/src/type1/t1objs.c @@ -4,7 +4,7 @@ /* */ /* Type 1 objects manager (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1objs.h b/src/type1/t1objs.h index 4a5b4e3ea..59e00e1c9 100644 --- a/src/type1/t1objs.h +++ b/src/type1/t1objs.h @@ -4,7 +4,7 @@ /* */ /* Type 1 objects manager (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1parse.c b/src/type1/t1parse.c index 77fb5f0ea..4d269a060 100644 --- a/src/type1/t1parse.c +++ b/src/type1/t1parse.c @@ -4,7 +4,7 @@ /* */ /* Type 1 parser (body). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1parse.h b/src/type1/t1parse.h index c5a1837ce..51be1b63d 100644 --- a/src/type1/t1parse.h +++ b/src/type1/t1parse.h @@ -4,7 +4,7 @@ /* */ /* Type 1 parser (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/t1tokens.h b/src/type1/t1tokens.h index 6c9dbdf57..f0a0c5dc9 100644 --- a/src/type1/t1tokens.h +++ b/src/type1/t1tokens.h @@ -4,7 +4,7 @@ /* */ /* Type 1 tokenizer (specification). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/type1/type1.c b/src/type1/type1.c index 365126510..ccc12be10 100644 --- a/src/type1/type1.c +++ b/src/type1/type1.c @@ -4,7 +4,7 @@ /* */ /* FreeType Type 1 driver component (body only). */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/winfonts/winfnt.c b/src/winfonts/winfnt.c index 547f92474..529769749 100644 --- a/src/winfonts/winfnt.c +++ b/src/winfonts/winfnt.c @@ -4,7 +4,7 @@ /* */ /* FreeType font driver for Windows FNT/FON files */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */ diff --git a/src/winfonts/winfnt.h b/src/winfonts/winfnt.h index 85defc7c4..e3b6c5547 100644 --- a/src/winfonts/winfnt.h +++ b/src/winfonts/winfnt.h @@ -4,7 +4,7 @@ /* */ /* FreeType font driver for Windows FNT/FON files */ /* */ -/* Copyright 1996-2000 by */ +/* Copyright 1996-2001 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */