diff options
| author | Werner Lemberg <wl@gnu.org> | 2001-06-28 17:49:10 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2001-06-28 17:49:10 +0000 |
| commit | 415235df1b955940ce85401a076f882e8717ef7b (patch) | |
| tree | 6a9820a949b195f2bcbcdd73e3b105f99f924b81 /src | |
| parent | 4a2305cf0c686d58273e264780b48b159e42f604 (diff) | |
| download | freetype2-415235df1b955940ce85401a076f882e8717ef7b.tar.gz | |
finishing function header formatting
updating copyrights
Diffstat (limited to 'src')
131 files changed, 253 insertions, 231 deletions
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, */ |