walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Allocate all array rows in a single ALLOC call. Saves over 2000 alloc 

2009-01-29  Behdad Esfahbod  <behdad@gnome.org>

        * pango/opentype/harfbuzz-gpos.c (Load_BaseArray), (Free_BaseArray):
        Allocate all array rows in a single ALLOC call.  Saves over 2000
        alloc calls when loading DejaVu Sans!
This commit is contained in:
Behdad Esfahbod 2009-01-29 09:19:20 +00:00 committed by Behdad Esfahbod
parent 549be924bc
commit 0a47c4f78e
1 changed files with 17 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/harfbuzz-gpos.c
View File

@ -2000,11 +2000,11 @@ static HB_Error Load_BaseArray( HB_BaseArray* ba,
{ {
HB_Error error; HB_Error error;
HB_UShort m, n, k, count; HB_UShort m, n, count;
HB_UInt cur_offset, new_offset, base_offset; HB_UInt cur_offset, new_offset, base_offset;
HB_BaseRecord *br; HB_BaseRecord *br;
HB_Anchor* ban; HB_Anchor *ban, *bans;
base_offset = FILE_Pos(); base_offset = FILE_Pos();
@ -2023,19 +2023,21 @@ static HB_Error Load_BaseArray( HB_BaseArray* ba,
br = ba->BaseRecord; br = ba->BaseRecord;
bans = NULL;
if ( ALLOC_ARRAY( bans, count * num_classes, HB_Anchor ) )
goto Fail;
for ( m = 0; m < count; m++ ) for ( m = 0; m < count; m++ )
{ {
br[m].BaseAnchor = NULL; br[m].BaseAnchor = NULL;
if ( ALLOC_ARRAY( br[m].BaseAnchor, num_classes, HB_Anchor ) ) ban = br[m].BaseAnchor = bans + m * num_classes;
goto Fail;
ban = br[m].BaseAnchor;
for ( n = 0; n < num_classes; n++ ) for ( n = 0; n < num_classes; n++ )
{ {
if ( ACCESS_Frame( 2L ) ) if ( ACCESS_Frame( 2L ) )
goto Fail0; goto Fail;
new_offset = GET_UShort() + base_offset; new_offset = GET_UShort() + base_offset;
@ -2053,30 +2055,15 @@ static HB_Error Load_BaseArray( HB_BaseArray* ba,
cur_offset = FILE_Pos(); cur_offset = FILE_Pos();
if ( FILE_Seek( new_offset ) || if ( FILE_Seek( new_offset ) ||
( error = Load_Anchor( &ban[n], stream ) ) != HB_Err_Ok ) ( error = Load_Anchor( &ban[n], stream ) ) != HB_Err_Ok )
goto Fail0; goto Fail;
(void)FILE_Seek( cur_offset ); (void)FILE_Seek( cur_offset );
} }
continue;
Fail0:
for ( k = 0; k < n; k++ )
Free_Anchor( &ban[k] );
goto Fail;
} }
return HB_Err_Ok; return HB_Err_Ok;
Fail: Fail:
for ( k = 0; k < m; k++ ) FREE( bans );
{
ban = br[k].BaseAnchor;
for ( n = 0; n < num_classes; n++ )
Free_Anchor( &ban[n] );
FREE( ban );
}
FREE( br ); FREE( br );
return error; return error;
} }
@ -2085,27 +2072,17 @@ Fail:
static void Free_BaseArray( HB_BaseArray* ba, static void Free_BaseArray( HB_BaseArray* ba,
HB_UShort num_classes ) HB_UShort num_classes )
{ {
HB_UShort m, n, count;
HB_BaseRecord *br; HB_BaseRecord *br;
HB_Anchor* ban; HB_Anchor *bans;
HB_UNUSED(num_classes);
if ( ba->BaseRecord ) if ( ba->BaseRecord )
{ {
count = ba->BaseCount;
br = ba->BaseRecord; br = ba->BaseRecord;
bans = br[0].BaseAnchor;
for ( m = 0; m < count; m++ ) FREE( bans );
{
ban = br[m].BaseAnchor;
for ( n = 0; n < num_classes; n++ )
Free_Anchor( &ban[n] );
FREE( ban );
}
FREE( br ); FREE( br );
} }
} }