ref: 5563bea09317831f0a16fcc4add230806f007cac
parent: 745a4f42a500c441ba4be4e096c6e63309ab0709
author: Werner Lemberg <[email protected]>
date: Tue Jun 24 01:44:28 EDT 2008
* src/psaux/psobjs.c (t1_builder_close_contour): Don't add contour if it consists of one point only. Based on a patch from Savannah bug #23683 (from John Tytgat).
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-24 Werner Lemberg <[email protected]>
+
+ * src/psaux/psobjs.c (t1_builder_close_contour): Don't add contour
+ if it consists of one point only. Based on a patch from Savannah
+ bug #23683 (from John Tytgat).
+
2008-06-22 Werner Lemberg <[email protected]>
* src/truetype/ttgload.c (TT_Load_Glyph): Protect bytecode stuff
--- a/src/psaux/psobjs.c
+++ b/src/psaux/psobjs.c
@@ -1634,27 +1634,24 @@
t1_builder_close_contour( T1_Builder builder )
{FT_Outline* outline = builder->current;
+ FT_Int first;
if ( !outline )
return;
- /* XXXX: We must not include the last point in the path if it */
- /* is located on the first point. */
+ first = outline->n_contours <= 1
+ ? 0 : outline->contours[outline->n_contours - 2] + 1;
+
+ /* 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;
FT_Byte* control = (FT_Byte*)outline->tags + outline->n_points - 1;
- if ( outline->n_contours > 1 )
- {- first = outline->contours[outline->n_contours - 2] + 1;
- p1 = outline->points + first;
- }
-
/* `delete' last point only if it coincides with the first */
/* point and it is not a control point (which can happen). */
if ( p1->x == p2->x && p1->y == p2->y )
@@ -1663,8 +1660,18 @@
}
if ( outline->n_contours > 0 )
- outline->contours[outline->n_contours - 1] =
- (short)( outline->n_points - 1 );
+ {+ /* Don't add contours only consisting of one point, i.e., */
+ /* check whether begin point and last point are the same. */
+ if ( first == outline->n_points - 1 )
+ {+ outline->n_contours--;
+ outline->n_points--;
+ }
+ else
+ outline->contours[outline->n_contours - 1] =
+ (short)( outline->n_points - 1 );
+ }
}