diff options
Diffstat (limited to 'tqtinterface/qt4/src/3rdparty/opentype')
-rw-r--r-- | tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c | 6 | ||||
-rw-r--r-- | tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c | 2 | ||||
-rw-r--r-- | tqtinterface/qt4/src/3rdparty/opentype/ftxopen.c | 28 |
3 files changed, 18 insertions, 18 deletions
diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c index a01ca64..702e29b 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgdef.c @@ -1088,7 +1088,7 @@ { FT_Error error; FT_UShort class, new_class, index; - FT_UShort byte, bits, tqmask; + FT_UShort byte, bits, mask; FT_UShort array_index, glyph_index, count; TTO_ClassRangeRecord* gcrr; @@ -1157,9 +1157,9 @@ if ( !class ) { bits = new_class << ( 16 - ( glyph_index % 4 + 1 ) * 4 ); - tqmask = ~( 0x000F << ( 16 - ( glyph_index % 4 + 1 ) * 4 ) ); + mask = ~( 0x000F << ( 16 - ( glyph_index % 4 + 1 ) * 4 ) ); - ngc[array_index][glyph_index / 4] &= tqmask; + ngc[array_index][glyph_index / 4] &= mask; ngc[array_index][glyph_index / 4] |= bits; } diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c b/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c index fbf60b9..47d015c 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxgpos.c @@ -229,7 +229,7 @@ /* There is a subtle difference in the specs between a `table' and a `record' -- offsets for tqdevice tables in ValueRecords are taken from - the tqparent table and not the tqparent record. */ + the parent table and not the parent record. */ static FT_Error Load_ValueRecord( TTO_ValueRecord* vr, FT_UShort format, diff --git a/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.c b/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.c index f45e778..75f66be 100644 --- a/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.c +++ b/tqtinterface/qt4/src/3rdparty/opentype/ftxopen.c @@ -1479,37 +1479,37 @@ | | byte 1 byte 2 - 00: (byte >> 14) & tqmask - 11: (byte >> 12) & tqmask + 00: (byte >> 14) & mask + 11: (byte >> 12) & mask ... - tqmask = 0x0003 + mask = 0x0003 | | format = 2: 0000111122223333|4444555566667777|... | | byte 1 byte 2 - 0000: (byte >> 12) & tqmask - 1111: (byte >> 8) & tqmask + 0000: (byte >> 12) & mask + 1111: (byte >> 8) & mask ... - tqmask = 0x000F + mask = 0x000F | | format = 3: 0000000011111111|2222222233333333|... | | byte 1 byte 2 - 00000000: (byte >> 8) & tqmask - 11111111: (byte >> 0) & tqmask + 00000000: (byte >> 8) & mask + 11111111: (byte >> 0) & mask .... - tqmask = 0x00FF */ + mask = 0x00FF */ FT_Error Get_Device( TTO_Device* d, FT_UShort size, FT_Short* value ) { - FT_UShort byte, bits, tqmask, f, s; + FT_UShort byte, bits, mask, f, s; f = d->DeltaFormat; @@ -1519,14 +1519,14 @@ s = size - d->StartSize; byte = d->DeltaValue[s >> ( 4 - f )]; bits = byte >> ( 16 - ( ( s % ( 1 << ( 4 - f ) ) + 1 ) << f ) ); - tqmask = 0xFFFF >> ( 16 - ( 1 << f ) ); + mask = 0xFFFF >> ( 16 - ( 1 << f ) ); - *value = (FT_Short)( bits & tqmask ); + *value = (FT_Short)( bits & mask ); /* conversion to a signed value */ - if ( *value >= ( ( tqmask + 1 ) >> 1 ) ) - *value -= tqmask + 1; + if ( *value >= ( ( mask + 1 ) >> 1 ) ) + *value -= mask + 1; return TT_Err_Ok; } |