Merge pull request #7046 from a0preetham/zero_descent_fix

fonts.js: bad metric overrides when values are zero
This commit is contained in:
Tim van der Meij 2016-03-09 12:14:03 +01:00
commit 147598417c
4 changed files with 16 additions and 2 deletions

View File

@ -722,6 +722,11 @@ var Font = (function FontClosure() {
function int16(b0, b1) {
return (b0 << 8) + b1;
}
function signedInt16(b0, b1) {
var value = (b0 << 8) + b1;
return value & (1 << 15) ? value - 0x10000 : value;
}
function int32(b0, b1, b2, b3) {
return (b0 << 24) + (b1 << 16) + (b2 << 8) + b3;
@ -2240,9 +2245,9 @@ var Font = (function FontClosure() {
var metricsOverride = {
unitsPerEm: int16(tables['head'].data[18], tables['head'].data[19]),
yMax: int16(tables['head'].data[42], tables['head'].data[43]),
yMin: int16(tables['head'].data[38], tables['head'].data[39]) - 0x10000,
yMin: signedInt16(tables['head'].data[38], tables['head'].data[39]),
ascent: int16(tables['hhea'].data[4], tables['hhea'].data[5]),
descent: int16(tables['hhea'].data[6], tables['hhea'].data[7]) - 0x10000
descent: signedInt16(tables['hhea'].data[6], tables['hhea'].data[7])
};
// PDF FontDescriptor metrics lie -- using data from actual font.

View File

@ -222,3 +222,4 @@
!annotation-squiggly.pdf
!annotation-highlight.pdf
!annotation-fileattachment.pdf
!zero_descent.pdf

BIN
test/pdfs/zero_descent.pdf Normal file

Binary file not shown.

View File

@ -2823,5 +2823,13 @@
"rounds": 1,
"lastPage": 1,
"type": "load"
},
{ "id": "zero_descent",
"file": "pdfs/zero_descent.pdf",
"md5": "32805ab28be1d0e91d27d9742c66eccf",
"link": false,
"rounds": 1,
"lastPage": 1,
"type": "text"
}
]