Commit d4af90b265c33e3ca64121b0e7ea9e4f23b2bfbb
2004-02-27T20:32:39
* src/pshinter/pshglob.c (psh_globals_new): Fix value of `dim->stdw.count'. Don't assign default values to blue scale and blue shift.
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
diff --git a/ChangeLog b/ChangeLog
index 57914c5..9c51f9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-02-26 Werner Lemberg <wl@gnu.org>
+
+ * src/pshinter/pshglob.c (psh_globals_new): Fix value of
+ `dim->stdw.count'.
+ Don't assign default values to blue scale and blue shift.
+
2004-02-25 Werner Lemberg <wl@gnu.org>
* docs/CHANGES: Updated.
diff --git a/src/pshinter/pshalgo.c b/src/pshinter/pshalgo.c
index 43e38d9..a2f61f5 100644
--- a/src/pshinter/pshalgo.c
+++ b/src/pshinter/pshalgo.c
@@ -1321,8 +1321,8 @@
;
}
- /* for each extrema, determine its direction along the */
- /* orthogonal axis */
+ /* for each extremum, determine its direction along the */
+ /* orthogonal axis */
for ( n = 0; n < glyph->num_points; n++ )
{
PSH_Point point, before, after;
@@ -1554,8 +1554,8 @@
}
}
- /* now, certain points may have been attached to hint and */
- /* not marked as strong; update their flags then */
+ /* now, certain points may have been attached to a hint and */
+ /* not marked as strong; update their flags then */
{
FT_UInt count = glyph->num_points;
PSH_Point point = glyph->points;
@@ -1626,7 +1626,7 @@
{
#if 1
- /* first technique: a point is strong if it is a local extrema */
+ /* first technique: a point is strong if it is a local extremum */
PSH_Dimension dim = &glyph->globals->dimension[dimension];
FT_Fixed scale = dim->scale_mult;
@@ -1640,7 +1640,7 @@
if ( psh_point_is_strong( point ) )
continue;
- /* sometimes, some local extremas are smooth points */
+ /* sometimes, some local extrema are smooth points */
if ( psh_point_is_smooth( point ) )
{
if ( point->dir_in == PSH_DIR_NONE ||
@@ -1671,7 +1671,7 @@
{
if ( psh_point_is_strong( cur ) )
{
- FT_Pos diff = cur->org_u - u;;
+ FT_Pos diff = cur->org_u - u;
if ( diff <= 0 )
diff --git a/src/pshinter/pshglob.c b/src/pshinter/pshglob.c
index a2edd0c..812713e 100644
--- a/src/pshinter/pshglob.c
+++ b/src/pshinter/pshglob.c
@@ -421,7 +421,7 @@
while ( threshold > 0 && FT_MulFix( threshold, scale ) > 32 )
- threshold --;
+ threshold--;
blues->blue_threshold = threshold;
}
@@ -539,7 +539,7 @@
no_shoots = blues->no_overshoots;
- /* lookup stem top in top zones table */
+ /* look up stem top in top zones table */
table = &blues->normal_top;
count = table->count;
zone = table->zones;
@@ -653,7 +653,7 @@
read++;
}
- dim->stdw.count = priv->num_snap_widths;
+ dim->stdw.count = priv->num_snap_widths + 1;
}
/* copy standard heights */
@@ -672,7 +672,7 @@
read++;
}
- dim->stdw.count = priv->num_snap_heights;
+ dim->stdw.count = priv->num_snap_heights + 1;
}
/* copy blue zones */
@@ -684,15 +684,9 @@
priv->family_blues, priv->num_family_other_blues,
priv->family_other_blues, priv->blue_fuzz, 1 );
- globals->blues.blue_scale = priv->blue_scale
- ? priv->blue_scale
- : 0x27A000L; /* 0.039625 * 0x10000 * 1000 */
-
- globals->blues.blue_shift = priv->blue_shift
- ? priv->blue_shift
- : 7;
-
- globals->blues.blue_fuzz = priv->blue_fuzz;
+ globals->blues.blue_scale = priv->blue_scale;
+ globals->blues.blue_shift = priv->blue_shift;
+ globals->blues.blue_fuzz = priv->blue_fuzz;
globals->dimension[0].scale_mult = 0;
globals->dimension[0].scale_delta = 0;