Commit 32b85e67cbfd1fe2824af80be296a0c263d42455
2000-06-29T21:48:58
various bug fixes in the postscript font drivers (mainly they added one un-necessary point to each contour..)
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 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230
diff --git a/src/cff/t2gload.c b/src/cff/t2gload.c
index 75c8eba..ee4f254 100644
--- a/src/cff/t2gload.c
+++ b/src/cff/t2gload.c
@@ -485,6 +485,23 @@
{
FT_Outline* outline = builder->current;
+ /* XXXX : we must not include the last point in the path if it */
+ /* is located on the first point.. */
+ if (outline->n_points > 1)
+ {
+ FT_Int first = 0;
+ FT_Vector* p1 = outline->points + first;
+ FT_Vector* p2 = outline->points + outline->n_points-1;
+
+ if (outline->n_contours > 1)
+ {
+ first = outline->contours[outline->n_contours-2]+1;
+ p1 = outline->points + first;
+ }
+
+ if ( p1->x == p2->x && p1->y == p2->y )
+ outline->n_points--;
+ }
if ( outline->n_contours > 0 )
outline->contours[outline->n_contours - 1] = outline->n_points - 1;
@@ -1676,8 +1693,13 @@
if ( load_flags & FT_LOAD_NO_RECURSE )
load_flags |= FT_LOAD_NO_SCALE | FT_LOAD_NO_HINTING;
- glyph->x_scale = size->metrics.x_scale;
- glyph->y_scale = size->metrics.y_scale;
+ glyph->x_scale = 0x10000;
+ glyph->y_scale = 0x10000;
+ if (size)
+ {
+ glyph->x_scale = size->metrics.x_scale;
+ glyph->y_scale = size->metrics.y_scale;
+ }
glyph->root.outline.n_points = 0;
glyph->root.outline.n_contours = 0;
@@ -1685,7 +1707,7 @@
hinting = ( load_flags & FT_LOAD_NO_SCALE ) == 0 &&
( load_flags & FT_LOAD_NO_HINTING ) == 0;
- glyph->root.format = ft_glyph_format_none;
+ glyph->root.format = ft_glyph_format_outline; /* by default */
{
FT_Byte* charstring;
@@ -1719,15 +1741,10 @@
{
/* for composite glyphs, return only the left side bearing and the */
/* advance width.. */
- if ( load_flags & FT_LOAD_NO_RECURSE )
+ if ( glyph->root.format == ft_glyph_format_composite )
{
-#if 0
- glyph->root.metrics.horiBearingX = decoder.builder.left_bearing.x;
- glyph->root.metrics.horiAdvance = decoder.builder.advance.x;
-#else
glyph->root.metrics.horiBearingX = decoder.builder.left_bearing.x;
glyph->root.metrics.horiAdvance = decoder.glyph_width;
-#endif /* 0 */
}
else
{
@@ -1736,11 +1753,7 @@
/* copy the _unscaled_ advance width */
-#if 0
- metrics->horiAdvance = decoder.builder.advance.x;
-#else
metrics->horiAdvance = decoder.glyph_width;
-#endif /* 0 */
/* make up vertical metrics */
metrics->vertBearingX = 0;
@@ -1749,18 +1762,12 @@
glyph->root.format = ft_glyph_format_outline;
- glyph->root.outline.flags &= ft_outline_owner;
+ glyph->root.outline.flags = 0;
if ( size && size->metrics.y_ppem < 24 )
glyph->root.outline.flags |= ft_outline_high_precision;
glyph->root.outline.flags |= ft_outline_reverse_fill;
-#if 0
- glyph->root.outline.second_pass = TRUE;
- glyph->root.outline.high_precision = size->root.metrics.y_ppem < 24;
- glyph->root.outline.dropout_mode = 2;
-#endif
-
if ( ( load_flags & FT_LOAD_NO_SCALE ) == 0 )
{
/* scale the outline and the metrics */
diff --git a/src/cid/cidgload.c b/src/cid/cidgload.c
index 1527583..3501990 100644
--- a/src/cid/cidgload.c
+++ b/src/cid/cidgload.c
@@ -335,6 +335,23 @@
{
FT_Outline* outline = builder->current;
+ /* XXXX : we must not include the last point in the path if it */
+ /* is located on the first point.. */
+ if (outline->n_points > 1)
+ {
+ FT_Int first = 0;
+ FT_Vector* p1 = outline->points + first;
+ FT_Vector* p2 = outline->points + outline->n_points-1;
+
+ if (outline->n_contours > 1)
+ {
+ first = outline->contours[outline->n_contours-2]+1;
+ p1 = outline->points + first;
+ }
+
+ if ( p1->x == p2->x && p1->y == p2->y )
+ outline->n_points--;
+ }
if ( outline->n_contours > 0 )
outline->contours[outline->n_contours - 1] = outline->n_points - 1;
diff --git a/src/sfnt/sfobjs.c b/src/sfnt/sfobjs.c
index 906d0e0..5087f12 100644
--- a/src/sfnt/sfobjs.c
+++ b/src/sfnt/sfobjs.c
@@ -276,7 +276,7 @@
if ( LOAD_( hdmx ) ||
LOAD_( gasp ) ||
LOAD_( kerning ) ||
- LOAD_( pclt ) )
+ LOAD_( pclt ) )
goto Exit;
#ifdef TT_CONFIG_OPTION_EXTEND_ENGINE
diff --git a/src/type1/t1gload.c b/src/type1/t1gload.c
index e838879..bef4a4a 100644
--- a/src/type1/t1gload.c
+++ b/src/type1/t1gload.c
@@ -1235,6 +1235,23 @@
{
FT_Outline* cur = builder->current;
+ /* XXXX : we must not include the last point in the path if it */
+ /* is located on the first point.. */
+ if (cur->n_points > 1)
+ {
+ FT_Int first = 0;
+ FT_Vector* p1 = cur->points + first;
+ FT_Vector* p2 = cur->points + cur->n_points-1;
+
+ if (cur->n_contours > 1)
+ {
+ first = cur->contours[cur->n_contours-2]+1;
+ p1 = cur->points + first;
+ }
+
+ if ( p1->x == p2->x && p1->y == p2->y )
+ cur->n_points--;
+ }
/* save current contour, if any */
if ( cur->n_contours > 0 )
@@ -1686,7 +1703,7 @@
{
/* for composite glyphs, return only the left side bearing and the */
/* advance width */
- if ( load_flags & FT_LOAD_NO_RECURSE )
+ if ( glyph->root.format == ft_glyph_format_composite )
{
glyph->root.metrics.horiBearingX = decoder.builder.left_bearing.x;
glyph->root.metrics.horiAdvance = decoder.builder.advance.x;
@@ -1728,19 +1745,13 @@
glyph->root.format = ft_glyph_format_outline;
- glyph->root.outline.flags &= ft_outline_owner;
+ glyph->root.outline.flags = 0;
if ( size->root.metrics.y_ppem < 24 )
glyph->root.outline.flags |= ft_outline_high_precision;
glyph->root.outline.flags |= ft_outline_reverse_fill;
-#if 0
- glyph->root.outline.second_pass = TRUE;
- glyph->root.outline.high_precision = size->root.metrics.y_ppem < 24;
- glyph->root.outline.dropout_mode = 2;
-#endif
-
if ( hinting )
{
/* adjust the advance width */
diff --git a/src/type1z/z1gload.c b/src/type1z/z1gload.c
index 6868339..ababad1 100644
--- a/src/type1z/z1gload.c
+++ b/src/type1z/z1gload.c
@@ -308,6 +308,24 @@
{
FT_Outline* outline = builder->current;
+ /* XXXX : we must not include the last point in the path if it */
+ /* is located on the first point.. */
+ if (outline->n_points > 1)
+ {
+ FT_Int first = 0;
+ FT_Vector* p1 = outline->points + first;
+ FT_Vector* p2 = outline->points + outline->n_points-1;
+
+ if (outline->n_contours > 1)
+ {
+ first = outline->contours[outline->n_contours-2]+1;
+ p1 = outline->points + first;
+ }
+
+ if ( p1->x == p2->x && p1->y == p2->y )
+ outline->n_points--;
+ }
+
if ( outline->n_contours > 0 )
outline->contours[outline->n_contours-1] = outline->n_points-1;
}