forked from minhngoc25a/freetype2
Forgot to check in last change.
This commit is contained in:
parent
d6d73989b0
commit
da245ee30a
|
@ -4,7 +4,7 @@
|
|||
/* */
|
||||
/* The FreeType glyph loader (body). */
|
||||
/* */
|
||||
/* Copyright 2002, 2003, 2004 by */
|
||||
/* Copyright 2002, 2003, 2004, 2005 by */
|
||||
/* David Turner, Robert Wilhelm, and Werner Lemberg */
|
||||
/* */
|
||||
/* This file is part of the FreeType project, and may only be used, */
|
||||
|
@ -296,14 +296,23 @@
|
|||
FT_BASE_DEF( void )
|
||||
FT_GlyphLoader_Add( FT_GlyphLoader loader )
|
||||
{
|
||||
FT_GlyphLoad base = &loader->base;
|
||||
FT_GlyphLoad current = &loader->current;
|
||||
FT_GlyphLoad base;
|
||||
FT_GlyphLoad current;
|
||||
|
||||
FT_UInt n_curr_contours = current->outline.n_contours;
|
||||
FT_UInt n_base_points = base->outline.n_points;
|
||||
FT_UInt n_curr_contours;
|
||||
FT_UInt n_base_points;
|
||||
FT_UInt n;
|
||||
|
||||
|
||||
if ( !loader )
|
||||
return;
|
||||
|
||||
base = &loader->base;
|
||||
current = &loader->current;
|
||||
|
||||
n_curr_contours = current->outline.n_contours;
|
||||
n_base_points = base->outline.n_points;
|
||||
|
||||
base->outline.n_points =
|
||||
(short)( base->outline.n_points + current->outline.n_points );
|
||||
base->outline.n_contours =
|
||||
|
|
|
@ -508,6 +508,9 @@
|
|||
FT_Outline* outline = builder->current;
|
||||
|
||||
|
||||
if ( !outline )
|
||||
return;
|
||||
|
||||
/* XXXX: We must not include the last point in the path if it */
|
||||
/* is located on the first point. */
|
||||
if ( outline->n_points > 1 )
|
||||
|
|
|
@ -1735,6 +1735,9 @@
|
|||
FT_Outline* outline = builder->current;
|
||||
|
||||
|
||||
if ( !outline )
|
||||
return;
|
||||
|
||||
/* XXXX: We must not include the last point in the path if it */
|
||||
/* is located on the first point. */
|
||||
if ( outline->n_points > 1 )
|
||||
|
|
Loading…
Reference in New Issue