ref: 406d25f3793af4cc08fee6884c740295383ee44b
parent: 5c74d3592f8754812105cd6b5959e16d5a154e14
author: Werner Lemberg <[email protected]>
date: Mon Feb 12 17:01:18 EST 2007
more formatting and copyright years
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,22 @@
2007-02-12 David Turner <[email protected]>
- * 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
rid of various uses of strcpy and other `evil' functions, as well as
to simplify a few things.
@@ -27,6 +36,8 @@
src/sfnt/sfdriver.c (sfnt_get_glyph_name), src/type1/t1driver.c
(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 <[email protected]>
--- 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;
--- 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,8 +2167,9 @@
return TT_DotFix14( dx, dy,
CUR.GS.projVector.x,
CUR.GS.projVector.y );
-}
+ }
+
/*************************************************************************/
/* */
/* <Function> */
@@ -2194,6 +2195,7 @@
CUR.GS.dualVector.y );
}
+
/*************************************************************************/
/* */
/* <Function> */
@@ -2219,6 +2221,7 @@
return dx;
}
+
/*************************************************************************/
/* */
/* <Function> */
@@ -2244,6 +2247,7 @@
return dy;
}
+
/*************************************************************************/
/* */
/* <Function> */
@@ -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 */
--- 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, */