[autofit,pshinter] NULL.

This commit is contained in:
Alexei Podtelezhnikov 2015-04-13 22:40:17 -04:00
parent eabc8d72e0
commit eae1b3e371
6 changed files with 27 additions and 27 deletions

View File

@ -863,19 +863,19 @@
if ( link == seg2 )
{
seg->link = 0;
seg->link = NULL;
seg->serif = link1;
}
else if ( link == link2 )
{
seg->link = 0;
seg->link = NULL;
seg->serif = seg1;
}
}
}
else
{
seg1->link = link1->link = 0;
seg1->link = link1->link = NULL;
break;
}
@ -892,7 +892,7 @@
seg2->num_linked++;
if ( seg2->link != seg1 )
{
seg1->link = 0;
seg1->link = NULL;
if ( seg2->score < dist_threshold || seg1->score < seg2->score * 4 )
seg1->serif = seg2->link;
@ -1159,7 +1159,7 @@
/* Example: the `c' in cour.pfa at size 13 */
if ( edge->serif && edge->link )
edge->serif = 0;
edge->serif = NULL;
}
}
@ -1712,7 +1712,7 @@
AF_Edge edge_limit = edges + axis->num_edges;
FT_PtrDist n_edges;
AF_Edge edge;
AF_Edge anchor = 0;
AF_Edge anchor = NULL;
FT_Pos delta = 0;
FT_Int skipped = 0;
FT_Bool has_last_stem = FALSE;

View File

@ -1792,7 +1792,7 @@
/* Example: the `c' in cour.pfa at size 13 */
if ( edge->serif && edge->link )
edge->serif = 0;
edge->serif = NULL;
}
}

View File

@ -1048,7 +1048,7 @@
{
if ( seg2->link != seg1 )
{
seg1->link = 0;
seg1->link = NULL;
seg1->serif = seg2->link;
}
}
@ -1128,7 +1128,7 @@
for ( seg = segments; seg < segment_limit; seg++ )
{
AF_Edge found = 0;
AF_Edge found = NULL;
FT_Int ee;
@ -1355,7 +1355,7 @@
/* Example: the `c' in cour.pfa at size 13 */
if ( edge->serif && edge->link )
edge->serif = 0;
edge->serif = NULL;
}
}
@ -1837,7 +1837,7 @@
AF_Edge edges = axis->edges;
AF_Edge edge_limit = edges + axis->num_edges;
AF_Edge edge;
AF_Edge anchor = 0;
AF_Edge anchor = NULL;
FT_Int has_serifs = 0;
FT_Pos anchor_drift = 0;

View File

@ -30,9 +30,9 @@
#ifdef DEBUG_HINTER
PSH_Hint_Table ps_debug_hint_table = 0;
PSH_HintFunc ps_debug_hint_func = 0;
PSH_Glyph ps_debug_glyph = 0;
PSH_Hint_Table ps_debug_hint_table = NULL;
PSH_HintFunc ps_debug_hint_func = NULL;
PSH_Glyph ps_debug_glyph = NULL;
#endif
@ -65,13 +65,13 @@
{
FT_FREE( table->zones );
table->num_zones = 0;
table->zone = 0;
table->zone = NULL;
FT_FREE( table->sort );
FT_FREE( table->hints );
table->num_hints = 0;
table->max_hints = 0;
table->sort_global = 0;
table->sort_global = NULL;
}
@ -119,7 +119,7 @@
PSH_Hint hint2;
hint->parent = 0;
hint->parent = NULL;
for ( ; count > 0; count--, sorted++ )
{
hint2 = sorted[0];
@ -192,7 +192,7 @@
table->sort_global = table->sort + count;
table->num_hints = 0;
table->num_zones = 0;
table->zone = 0;
table->zone = NULL;
/* initialize the `table->hints' array */
{
@ -1140,7 +1140,7 @@
glyph->num_points = 0;
glyph->num_contours = 0;
glyph->memory = 0;
glyph->memory = NULL;
}
@ -2035,7 +2035,7 @@
/* count the number of strong points in this contour */
next = start + contour->count;
fit_count = 0;
first = 0;
first = NULL;
for ( point = start; point < next; point++ )
if ( psh_point_is_fitted( point ) )

View File

@ -23,7 +23,7 @@
#include "pshglob.h"
#ifdef DEBUG_HINTER
PSH_Globals ps_debug_globals = 0;
PSH_Globals ps_debug_globals = NULL;
#endif
@ -369,7 +369,7 @@
{
FT_UInt count;
FT_UInt num;
PSH_Blue_Table table = 0;
PSH_Blue_Table table = NULL;
/* */
/* Determine whether we need to suppress overshoots or */
@ -635,7 +635,7 @@
FT_FREE( globals );
#ifdef DEBUG_HINTER
ps_debug_globals = 0;
ps_debug_globals = NULL;
#endif
}
}

View File

@ -31,7 +31,7 @@
#define FT_COMPONENT trace_pshrec
#ifdef DEBUG_HINTER
PS_Hints ps_debug_hints = 0;
PS_Hints ps_debug_hints = NULL;
int ps_debug_no_horz_hints = 0;
int ps_debug_no_vert_hints = 0;
#endif
@ -85,7 +85,7 @@
{
FT_Error error = FT_Err_Ok;
FT_UInt count;
PS_Hint hint = 0;
PS_Hint hint = NULL;
count = table->num_hints;
@ -254,7 +254,7 @@
{
FT_UInt count;
FT_Error error = FT_Err_Ok;
PS_Mask mask = 0;
PS_Mask mask = NULL;
count = table->num_masks;
@ -810,7 +810,7 @@
ps_dimension_done( &hints->dimension[1], memory );
hints->error = FT_Err_Ok;
hints->memory = 0;
hints->memory = NULL;
}