From 406d25f3793af4cc08fee6884c740295383ee44b Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 12 Feb 2007 22:01:18 +0000 Subject: [PATCH] more formatting and copyright years --- ChangeLog | 21 ++++++++++++++++----- builds/mac/ftmac.c | 3 ++- src/truetype/ttinterp.c | 26 +++++++++++++++----------- src/truetype/ttinterp.h | 2 +- 4 files changed, 34 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 94a7ab647..fa968ed80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,20 @@ 2007-02-12 David Turner - * src/truetype/ttinterp.h, src/truetype/ttinterp.c: Simplify - projection and dual-projection code interface. + Simplify projection and dual-projection code interface. - * src/autofit/afloader.c: Improve spacing adjustments for the - non-light auto-hinted modes. Gets rid of `inter-letter spacing is - too wide' problems. + * src/truetype/ttinterp.h (TT_Project_Func): Use `FT_Pos', not + FT_Vector' as argument type. + * src/truetype/ttinterp.c (CUR_Func_project, CUR_Func_dualproj): + Updated. + (CUR_fast_project, CUR_fast_dualproj): New macros. + (Project, Dual_Project, Project_x, Project_y): Updated. + (Ins_GC, Ins_SCFS, Ins_MDAP, Ins_MIAP, Ins_IP): Use new `fast' + macros. + + + * src/autofit/afloader.c (af_loader_load_g): Improve spacing + adjustments for the non-light auto-hinted modes. Gets rid of + `inter-letter spacing is too wide' problems. Introduce new string functions and the corresponding macros to get @@ -28,6 +37,8 @@ (t1_get_glyph_name), src/type42/t42drivr.c (t42_get_glyph_name, t42_get_name_index): Use new functions and simplify code. + * builds/mac/ftmac.c (FT_FSPathMakeSpec): Don't use FT_MIN. + 2007-02-11 Werner Lemberg * src/autofit/afloader.c (af_loader_load_g): Don't change width for diff --git a/builds/mac/ftmac.c b/builds/mac/ftmac.c index 0f2c27d24..4c0788fd9 100644 --- a/builds/mac/ftmac.c +++ b/builds/mac/ftmac.c @@ -443,7 +443,8 @@ { int len = ft_strlen( p ); - if (len > 255) + + if ( len > 255 ) len = 255; q = p + len; diff --git a/src/truetype/ttinterp.c b/src/truetype/ttinterp.c index 885178477..3b5d36eeb 100644 --- a/src/truetype/ttinterp.c +++ b/src/truetype/ttinterp.c @@ -206,17 +206,17 @@ Move_Zp2_Point( EXEC_ARG_ a, b, c, t ) -# define CUR_Func_project( v1, v2 ) \ - CUR.func_project( EXEC_ARG_ (v1)->x - (v2)->x, (v1)->y - (v2)->y ) +#define CUR_Func_project( v1, v2 ) \ + CUR.func_project( EXEC_ARG_ (v1)->x - (v2)->x, (v1)->y - (v2)->y ) -# define CUR_Func_dualproj( v1, v2 ) \ - CUR.func_dualproj( EXEC_ARG_ (v1)->x - (v2)->x, (v1)->y - (v2)->y ) +#define CUR_Func_dualproj( v1, v2 ) \ + CUR.func_dualproj( EXEC_ARG_ (v1)->x - (v2)->x, (v1)->y - (v2)->y ) -# define CUR_fast_project(v) \ - CUR.func_project( EXEC_ARG_ (v)->x, (v)->y ) +#define CUR_fast_project( v ) \ + CUR.func_project( EXEC_ARG_ (v)->x, (v)->y ) -# define CUR_fast_dualproj(v) \ - CUR.func_dualproj( EXEC_ARG_ (v)->x, (v)->y ) +#define CUR_fast_dualproj( v ) \ + CUR.func_dualproj( EXEC_ARG_ (v)->x, (v)->y ) /*************************************************************************/ @@ -2159,7 +2159,7 @@ static FT_F26Dot6 Project( EXEC_OP_ FT_Pos dx, FT_Pos dy ) -{ + { #ifdef TT_CONFIG_OPTION_UNPATENTED_HINTING FT_ASSERT( !CUR.face->unpatented_hinting ); #endif @@ -2167,7 +2167,8 @@ return TT_DotFix14( dx, dy, CUR.GS.projVector.x, CUR.GS.projVector.y ); -} + } + /*************************************************************************/ /* */ @@ -2194,6 +2195,7 @@ CUR.GS.dualVector.y ); } + /*************************************************************************/ /* */ /* */ @@ -2219,6 +2221,7 @@ return dx; } + /*************************************************************************/ /* */ /* */ @@ -2244,6 +2247,7 @@ return dy; } + /*************************************************************************/ /* */ /* */ @@ -5670,7 +5674,7 @@ /* The behaviour of an MIAP instruction is quite */ /* different when used in the twilight zone. */ /* */ - /* First, no control value cutin test is performed */ + /* First, no control value cut-in test is performed */ /* as it would fail anyway. Second, the original */ /* point, i.e. (org_x,org_y) of zp0.point, is set */ /* to the absolute, unrounded distance found in */ diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h index fe29481b5..07a8972cb 100644 --- a/src/truetype/ttinterp.h +++ b/src/truetype/ttinterp.h @@ -4,7 +4,7 @@ /* */ /* TrueType bytecode interpreter (specification). */ /* */ -/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006 by */ +/* Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2007 by */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* */ /* This file is part of the FreeType project, and may only be used, */