[pfr] Minor.
* src/pfr/pfrsbit.c, srf/pfr/pfrobjs.c: Use flag names instead of bare numbers.
This commit is contained in:
parent
59828f72a2
commit
2aa6956565
|
@ -1,3 +1,10 @@
|
||||||
|
2016-03-25 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
[pfr] Minor.
|
||||||
|
|
||||||
|
* src/pfr/pfrsbit.c, srf/pfr/pfrobjs.c: Use flag names instead of
|
||||||
|
bare numbers.
|
||||||
|
|
||||||
2016-03-25 Werner Lemberg <wl@gnu.org>
|
2016-03-25 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
[pfr] Various clang sanitizer fixes.
|
[pfr] Various clang sanitizer fixes.
|
||||||
|
|
|
@ -524,8 +524,8 @@
|
||||||
FT_UInt probe = power * size;
|
FT_UInt probe = power * size;
|
||||||
FT_UInt extra = count - power;
|
FT_UInt extra = count - power;
|
||||||
FT_Byte* base = stream->cursor;
|
FT_Byte* base = stream->cursor;
|
||||||
FT_Bool twobytes = FT_BOOL( item->flags & 1 );
|
FT_Bool twobytes = FT_BOOL( item->flags & PFR_KERN_2BYTE_CHAR );
|
||||||
FT_Bool twobyte_adj = FT_BOOL( item->flags & 2 );
|
FT_Bool twobyte_adj = FT_BOOL( item->flags & PFR_KERN_2BYTE_ADJ );
|
||||||
FT_Byte* p;
|
FT_Byte* p;
|
||||||
FT_UInt32 cpair;
|
FT_UInt32 cpair;
|
||||||
|
|
||||||
|
|
|
@ -283,14 +283,17 @@
|
||||||
FT_ULong* found_size )
|
FT_ULong* found_size )
|
||||||
{
|
{
|
||||||
FT_UInt left, right, char_len;
|
FT_UInt left, right, char_len;
|
||||||
FT_Bool two = FT_BOOL( flags & 1 );
|
FT_Bool two = FT_BOOL( flags & PFR_BITMAP_2BYTE_CHARCODE );
|
||||||
FT_Byte* buff;
|
FT_Byte* buff;
|
||||||
|
|
||||||
|
|
||||||
char_len = 4;
|
char_len = 4;
|
||||||
if ( two ) char_len += 1;
|
if ( two )
|
||||||
if ( flags & 2 ) char_len += 1;
|
char_len += 1;
|
||||||
if ( flags & 4 ) char_len += 1;
|
if ( flags & PFR_BITMAP_2BYTE_SIZE )
|
||||||
|
char_len += 1;
|
||||||
|
if ( flags & PFR_BITMAP_3BYTE_OFFSET )
|
||||||
|
char_len += 1;
|
||||||
|
|
||||||
left = 0;
|
left = 0;
|
||||||
right = count;
|
right = count;
|
||||||
|
@ -329,12 +332,12 @@
|
||||||
return;
|
return;
|
||||||
|
|
||||||
Found_It:
|
Found_It:
|
||||||
if ( flags & 2 )
|
if ( flags & PFR_BITMAP_2BYTE_SIZE )
|
||||||
*found_size = PFR_NEXT_USHORT( buff );
|
*found_size = PFR_NEXT_USHORT( buff );
|
||||||
else
|
else
|
||||||
*found_size = PFR_NEXT_BYTE( buff );
|
*found_size = PFR_NEXT_BYTE( buff );
|
||||||
|
|
||||||
if ( flags & 4 )
|
if ( flags & PFR_BITMAP_3BYTE_OFFSET )
|
||||||
*found_offset = PFR_NEXT_ULONG( buff );
|
*found_offset = PFR_NEXT_ULONG( buff );
|
||||||
else
|
else
|
||||||
*found_offset = PFR_NEXT_USHORT( buff );
|
*found_offset = PFR_NEXT_USHORT( buff );
|
||||||
|
@ -570,9 +573,12 @@
|
||||||
|
|
||||||
|
|
||||||
char_len = 4;
|
char_len = 4;
|
||||||
if ( strike->flags & 1 ) char_len += 1;
|
if ( strike->flags & PFR_BITMAP_2BYTE_CHARCODE )
|
||||||
if ( strike->flags & 2 ) char_len += 1;
|
char_len += 1;
|
||||||
if ( strike->flags & 4 ) char_len += 1;
|
if ( strike->flags & PFR_BITMAP_2BYTE_SIZE )
|
||||||
|
char_len += 1;
|
||||||
|
if ( strike->flags & PFR_BITMAP_3BYTE_OFFSET )
|
||||||
|
char_len += 1;
|
||||||
|
|
||||||
/* access data directly in the frame to speed lookups */
|
/* access data directly in the frame to speed lookups */
|
||||||
if ( FT_STREAM_SEEK( phys->bct_offset + strike->bct_offset ) ||
|
if ( FT_STREAM_SEEK( phys->bct_offset + strike->bct_offset ) ||
|
||||||
|
@ -733,7 +739,8 @@
|
||||||
p,
|
p,
|
||||||
stream->limit,
|
stream->limit,
|
||||||
format,
|
format,
|
||||||
FT_BOOL(face->header.color_flags & 2),
|
FT_BOOL( face->header.color_flags &
|
||||||
|
PFR_FLAG_INVERT_BITMAP ),
|
||||||
&glyph->root.bitmap );
|
&glyph->root.bitmap );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue