diff options
| author | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-11-26 09:15:46 -0500 |
|---|---|---|
| committer | Alexei Podtelezhnikov <apodtele@gmail.com> | 2021-11-26 09:15:46 -0500 |
| commit | 36a905e17425af668d2db882fd33ee598b404ed6 (patch) | |
| tree | 62b7f256468f469ba05b9a0b232176ca689820e9 | |
| parent | 32f13c11a4edb2c22d5fad5dca7eb9bcdf2bcdad (diff) | |
| download | freetype2-36a905e17425af668d2db882fd33ee598b404ed6.tar.gz | |
* src/truetype/ttpload.c (tt_face_load_hdmx): Added comments.
| -rw-r--r-- | src/truetype/ttpload.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/truetype/ttpload.c b/src/truetype/ttpload.c index c1ce0d634..71db75ae1 100644 --- a/src/truetype/ttpload.c +++ b/src/truetype/ttpload.c @@ -555,7 +555,7 @@ if ( record_size >= 0xFFFF0000UL ) record_size &= 0xFFFFU; - FT_TRACE2(( "Hdmx ", num_records, record_size )); + FT_TRACE2(( "Hdmx " )); /* The limit for `num_records' is a heuristic value. */ if ( num_records > 255 || num_records == 0 ) @@ -564,18 +564,21 @@ goto Fail; } - /* Out-of-spec tables are rejected. */ - if ( (FT_Long)record_size != ( ( face->root.num_glyphs + 5 ) & ~3 ) ) + /* Out-of-spec tables are rejected. The record size must be */ + /* equal to the number of glyphs + 2 + 32-bit padding. */ + if ( (FT_Long)record_size != ( ( face->root.num_glyphs + 2 + 3 ) & ~3 ) ) { FT_TRACE2(( "with record size off by %ld bytes rejected\n", - (FT_Long)record_size - - ( ( face->root.num_glyphs + 5 ) & ~3 ) )); + (FT_Long)record_size - + ( ( face->root.num_glyphs + 2 + 3 ) & ~3 ) )); goto Fail; } if ( FT_QNEW_ARRAY( face->hdmx_record_sizes, num_records ) ) goto Fail; + /* XXX: We do not check if the records are sorted by ppem */ + /* and cannot use binary search later. */ for ( nn = 0; nn < num_records; nn++ ) { if ( p + record_size > limit ) |