Commit 406d25f3793af4cc08fee6884c740295383ee44b
2007-02-12T22:01:18
more formatting and copyright years
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148
diff --git a/ChangeLog b/ChangeLog
index 94a7ab6..fa968ed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,11 +1,20 @@
2007-02-12 David Turner <david@freetype.org>
- * src/truetype/ttinterp.h, src/truetype/ttinterp.c: Simplify
- projection and dual-projection code interface.
+ Simplify projection and dual-projection code interface.
+
+ * 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: Improve spacing adjustments for the
- non-light auto-hinted modes. Gets rid of `inter-letter spacing is
- too wide' problems.
+
+ * 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 <wl@gnu.org>
* 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 0f2c27d..4c0788f 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 8851784..3b5d36e 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 );
}
+
/*************************************************************************/
/* */
/* <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 */
diff --git a/src/truetype/ttinterp.h b/src/truetype/ttinterp.h
index fe29481..07a8972 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, */