diff options
| author | Werner Lemberg <wl@gnu.org> | 2016-03-25 10:54:37 +0100 |
|---|---|---|
| committer | Werner Lemberg <wl@gnu.org> | 2016-03-26 22:42:13 +0100 |
| commit | 2aa695656529c821168db9b97fac120b52876677 (patch) | |
| tree | 3fbf9ca20172a3138cc2cacbcf5399fd0a3616f8 | |
| parent | 59828f72a2f988abcc15873e5b3091295a783257 (diff) | |
| download | freetype2-2aa695656529c821168db9b97fac120b52876677.tar.gz | |
[pfr] Minor.
* src/pfr/pfrsbit.c, srf/pfr/pfrobjs.c: Use flag names instead of
bare numbers.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | src/pfr/pfrobjs.c | 4 | ||||
| -rw-r--r-- | src/pfr/pfrsbit.c | 27 |
3 files changed, 26 insertions, 12 deletions
@@ -1,5 +1,12 @@ 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> + [pfr] Various clang sanitizer fixes. * src/pfr/pfrsbit.c (pfr_load_bitmap_metrics): Correctly handle diff --git a/src/pfr/pfrobjs.c b/src/pfr/pfrobjs.c index 81b1312fe..769a3b616 100644 --- a/src/pfr/pfrobjs.c +++ b/src/pfr/pfrobjs.c @@ -524,8 +524,8 @@ FT_UInt probe = power * size; FT_UInt extra = count - power; FT_Byte* base = stream->cursor; - FT_Bool twobytes = FT_BOOL( item->flags & 1 ); - FT_Bool twobyte_adj = FT_BOOL( item->flags & 2 ); + FT_Bool twobytes = FT_BOOL( item->flags & PFR_KERN_2BYTE_CHAR ); + FT_Bool twobyte_adj = FT_BOOL( item->flags & PFR_KERN_2BYTE_ADJ ); FT_Byte* p; FT_UInt32 cpair; diff --git a/src/pfr/pfrsbit.c b/src/pfr/pfrsbit.c index 8ec31ac8b..9bc5d41d1 100644 --- a/src/pfr/pfrsbit.c +++ b/src/pfr/pfrsbit.c @@ -283,14 +283,17 @@ FT_ULong* found_size ) { 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; char_len = 4; - if ( two ) char_len += 1; - if ( flags & 2 ) char_len += 1; - if ( flags & 4 ) char_len += 1; + if ( two ) + char_len += 1; + if ( flags & PFR_BITMAP_2BYTE_SIZE ) + char_len += 1; + if ( flags & PFR_BITMAP_3BYTE_OFFSET ) + char_len += 1; left = 0; right = count; @@ -329,12 +332,12 @@ return; Found_It: - if ( flags & 2 ) + if ( flags & PFR_BITMAP_2BYTE_SIZE ) *found_size = PFR_NEXT_USHORT( buff ); else *found_size = PFR_NEXT_BYTE( buff ); - if ( flags & 4 ) + if ( flags & PFR_BITMAP_3BYTE_OFFSET ) *found_offset = PFR_NEXT_ULONG( buff ); else *found_offset = PFR_NEXT_USHORT( buff ); @@ -570,9 +573,12 @@ char_len = 4; - if ( strike->flags & 1 ) char_len += 1; - if ( strike->flags & 2 ) char_len += 1; - if ( strike->flags & 4 ) char_len += 1; + if ( strike->flags & PFR_BITMAP_2BYTE_CHARCODE ) + 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 */ if ( FT_STREAM_SEEK( phys->bct_offset + strike->bct_offset ) || @@ -733,7 +739,8 @@ p, stream->limit, format, - FT_BOOL(face->header.color_flags & 2), + FT_BOOL( face->header.color_flags & + PFR_FLAG_INVERT_BITMAP ), &glyph->root.bitmap ); } } |