diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-03-29 08:56:03 +0200 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-03-29 08:56:03 +0200 |
| commit | 2a03e5d9fb1392f1c57f26589cd3d5efb19f4fa1 (patch) | |
| tree | 3dfed13fb3d2d87b1663f5b96bdf81c87a5cc7be /src/pfr | |
| parent | 31dc8f98f6ab7d8091d43a76937b0d01adc8de5c (diff) | |
| download | freetype2-2a03e5d9fb1392f1c57f26589cd3d5efb19f4fa1.tar.gz | |
[pfr] Minor.
* src/pfr/pfrsbit.c (pfr_lookup_bitmap_data): Replace `left',
`right', and `middle' with `min', `max', and `mid' as used in other
FreeType binary search code.
(pfr_load_bitmap_metrics): Fix invalid left shift.
Diffstat (limited to 'src/pfr')
| -rw-r--r-- | src/pfr/pfrsbit.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/pfr/pfrsbit.c b/src/pfr/pfrsbit.c index d2715937f..abdbb2084 100644 --- a/src/pfr/pfrsbit.c +++ b/src/pfr/pfrsbit.c @@ -282,7 +282,7 @@ FT_ULong* found_offset, FT_ULong* found_size ) { - FT_UInt left, right, char_len; + FT_UInt min, max, char_len; FT_Bool two = FT_BOOL( *flags & PFR_BITMAP_2BYTE_CHARCODE ); FT_Byte* buff; @@ -347,16 +347,17 @@ if ( !( *flags & PFR_BITMAP_VALID_CHARCODES ) ) goto Fail; - left = 0; - right = count; + min = 0; + max = count; - while ( left < right ) + /* binary search */ + while ( min < max ) { - FT_UInt middle, code; + FT_UInt mid, code; - middle = ( left + right ) >> 1; - buff = base + middle * char_len; + mid = ( min + max ) >> 1; + buff = base + mid * char_len; if ( two ) code = PFR_NEXT_USHORT( buff ); @@ -367,9 +368,9 @@ goto Found_It; if ( code < char_code ) - left = middle; + min = mid; else - right = middle; + max = mid; } Fail: @@ -494,7 +495,7 @@ case 1: PFR_CHECK( 1 ); - advance = PFR_NEXT_INT8( p ) << 8; + advance = PFR_NEXT_INT8( p ) * 256; break; case 2: |