Commit dba4b3243ad012b54980a72d537fbcfa0bb07018
2000-02-10T16:08:59
small update to the kerning code
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
diff --git a/src/truetype/ttdriver.c b/src/truetype/ttdriver.c
index d61d8e3..8b2f7e1 100644
--- a/src/truetype/ttdriver.c
+++ b/src/truetype/ttdriver.c
@@ -322,8 +322,8 @@
/* */
static
TT_Error Get_Kerning( TT_Face face,
- TT_UShort left_glyph,
- TT_UShort right_glyph,
+ TT_UInt left_glyph,
+ TT_UInt right_glyph,
TT_Vector* kerning )
{
TT_Kern_0_Pair* pair;
@@ -345,9 +345,9 @@
left = 0;
right = face->num_kern_pairs - 1;
- while ( left + 1 < right )
+ while ( left <= right )
{
- TT_Int middle = (left + right) >> 1;
+ TT_Int middle = left + ((right-left) >> 1);
TT_ULong cur_pair;
@@ -358,18 +358,10 @@
goto Found;
if ( cur_pair < search_tag )
- left = middle;
+ left = middle+1;
else
- right = middle;
+ right = middle-1;
}
-
- pair = face->kern_pairs + left;
- if ( PAIR_TAG( pair->left, pair->right ) == search_tag )
- goto Found;
-
- pair = face->kern_pairs + right;
- if ( PAIR_TAG( pair->left, pair->right ) == search_tag )
- goto Found;
}
Exit: