ReceiveTempSMS
/
Al-Qurtas-Islamic-bank-The-Best-Bank-in-Iraq
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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.
This commit is contained in:
Werner Lemberg 2016-03-29 08:56:03 +02:00
parent 31dc8f98f6
commit 2a03e5d9fb
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2016-03-29 Werner Lemberg <wl@gnu.org>
[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.
2016-03-29 Werner Lemberg <wl@gnu.org> 2016-03-29 Werner Lemberg <wl@gnu.org>
* src/pfr/pfrtypes.h: Replace all enums with macros. * src/pfr/pfrtypes.h: Replace all enums with macros.

21
src/pfr/pfrsbit.c
View File

@ -282,7 +282,7 @@
FT_ULong* found_offset, FT_ULong* found_offset,
FT_ULong* found_size ) 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_Bool two = FT_BOOL( *flags & PFR_BITMAP_2BYTE_CHARCODE );
FT_Byte* buff; FT_Byte* buff;
@ -347,16 +347,17 @@
if ( !( *flags & PFR_BITMAP_VALID_CHARCODES ) ) if ( !( *flags & PFR_BITMAP_VALID_CHARCODES ) )
goto Fail; goto Fail;
left = 0; min = 0;
right = count; max = count;
while ( left < right ) /* binary search */
while ( min < max )
{ {
FT_UInt middle, code; FT_UInt mid, code;
middle = ( left + right ) >> 1; mid = ( min + max ) >> 1;
buff = base + middle * char_len; buff = base + mid * char_len;
if ( two ) if ( two )
code = PFR_NEXT_USHORT( buff ); code = PFR_NEXT_USHORT( buff );
@ -367,9 +368,9 @@
goto Found_It; goto Found_It;
if ( code < char_code ) if ( code < char_code )
left = middle; min = mid;
else else
right = middle; max = mid;
} }
Fail: Fail:
@ -494,7 +495,7 @@
case 1: case 1:
PFR_CHECK( 1 ); PFR_CHECK( 1 );
advance = PFR_NEXT_INT8( p ) << 8; advance = PFR_NEXT_INT8( p ) * 256;
break; break;
case 2: case 2: