diff options
| author | Werner Lemberg <wl@gnu.org> | 2003-09-17 05:26:33 +0000 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2003-09-17 05:26:33 +0000 |
| commit | 013efd14103cbe453714749c1abe16258385d911 (patch) | |
| tree | ae0baf5ff05b92fb389f4721c1d46a616ac4e355 /src/pfr/pfrload.c | |
| parent | 104dd41d968d29056cdbe2bdbd2d1e3462261421 (diff) | |
| download | freetype2-013efd14103cbe453714749c1abe16258385d911.tar.gz | |
Formatting.
Diffstat (limited to 'src/pfr/pfrload.c')
| -rw-r--r-- | src/pfr/pfrload.c | 41 |
1 files changed, 24 insertions, 17 deletions
diff --git a/src/pfr/pfrload.c b/src/pfr/pfrload.c index 1ef58460e..f3cdb04c3 100644 --- a/src/pfr/pfrload.c +++ b/src/pfr/pfrload.c @@ -609,23 +609,26 @@ } - /* the kerning data embedded in a PFR font are (charcode,charcode) - * pairs, we need to translate them to (gindex,gindex) and sort - * the resulting array + /* + * The kerning data embedded in a PFR font are (charcode,charcode) + * pairs; we need to translate them to (gindex,gindex) and sort + * the resulting array. */ static FT_UInt - pfr_get_gindex( PFR_Char chars, - FT_UInt count, - FT_UInt charcode ) + pfr_get_gindex( PFR_Char chars, + FT_UInt count, + FT_UInt charcode ) { - FT_UInt min = 0; - FT_UInt max = count; + FT_UInt min = 0; + FT_UInt max = count; + while ( min < max ) { - FT_UInt mid = (min+max) >> 1; + FT_UInt mid = ( min + max ) >> 1; PFR_Char c = chars + mid; + if ( c->char_code == charcode ) return mid + 1; @@ -639,12 +642,13 @@ FT_CALLBACK_DEF( int ) - pfr_compare_kern_pairs( const void* pair1, - const void* pair2 ) + pfr_compare_kern_pairs( const void* pair1, + const void* pair2 ) { FT_UInt32 p1 = PFR_KERN_PAIR_INDEX( (PFR_KernPair)pair1 ); FT_UInt32 p2 = PFR_KERN_PAIR_INDEX( (PFR_KernPair)pair2 ); + if ( p1 < p2 ) return -1; if ( p1 > p2 ) @@ -654,8 +658,8 @@ static FT_Error - pfr_sort_kerning_pairs( FT_Stream stream, - PFR_PhyFont phy_font ) + pfr_sort_kerning_pairs( FT_Stream stream, + PFR_PhyFont phy_font ) { FT_Error error; FT_Memory memory = stream->memory; @@ -665,6 +669,7 @@ FT_UInt num_chars = phy_font->num_chars; FT_UInt count; + /* create kerning pairs array */ if ( FT_NEW_ARRAY( phy_font->kern_pairs, phy_font->num_kern_pairs ) ) @@ -682,6 +687,7 @@ FT_UInt limit = count + item->pair_count; FT_Byte* p; + if ( limit > phy_font->num_kern_pairs ) { error = PFR_Err_Invalid_Table; @@ -700,6 +706,7 @@ FT_UInt char1, char2; FT_Int kerning; + if ( item->flags & PFR_KERN_2BYTE_CHAR ) { char1 = FT_NEXT_USHORT( p ); @@ -744,10 +751,10 @@ static const PFR_ExtraItemRec pfr_phy_font_extra_items[] = { - { 1, (PFR_ExtraItem_ParseFunc) pfr_extra_item_load_bitmap_info }, - { 2, (PFR_ExtraItem_ParseFunc) pfr_extra_item_load_font_id }, - { 3, (PFR_ExtraItem_ParseFunc) pfr_extra_item_load_stem_snaps }, - { 4, (PFR_ExtraItem_ParseFunc) pfr_extra_item_load_kerning_pairs }, + { 1, (PFR_ExtraItem_ParseFunc)pfr_extra_item_load_bitmap_info }, + { 2, (PFR_ExtraItem_ParseFunc)pfr_extra_item_load_font_id }, + { 3, (PFR_ExtraItem_ParseFunc)pfr_extra_item_load_stem_snaps }, + { 4, (PFR_ExtraItem_ParseFunc)pfr_extra_item_load_kerning_pairs }, { 0, NULL } }; |