Skip to content

Commit e7df150

Browse files
authored
Merge pull request #57 from mondrake/master
'Undefined offset:' notices in loca and htmx classes
2 parents dfaecf1 + baa3911 commit e7df150

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

src/FontLib/Table/Type/hmtx.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@ protected function _parse() {
2727
$data = array();
2828
$metrics = $font->readUInt16Many($numOfLongHorMetrics * 2);
2929
for ($gid = 0, $mid = 0; $gid < $numOfLongHorMetrics; $gid++) {
30-
$advanceWidth = $metrics[$mid++];
31-
$leftSideBearing = $metrics[$mid++];
30+
$advanceWidth = isset($metrics[$mid]) ? $metrics[$mid] : 0;
31+
$mid += 1;
32+
$leftSideBearing = isset($metrics[$mid]) ? $metrics[$mid] : 0;
33+
$mid += 1;
3234
$data[$gid] = array($advanceWidth, $leftSideBearing);
3335
}
3436

src/FontLib/Table/Type/loca.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ protected function _parse() {
3232
$loc = unpack("n*", $d);
3333

3434
for ($i = 0; $i <= $numGlyphs; $i++) {
35-
$data[] = $loc[$i + 1] * 2;
35+
$data[] = isset($loc[$i + 1]) ? $loc[$i + 1] * 2 : 0;
3636
}
3737
}
3838

@@ -43,7 +43,7 @@ protected function _parse() {
4343
$loc = unpack("N*", $d);
4444

4545
for ($i = 0; $i <= $numGlyphs; $i++) {
46-
$data[] = $loc[$i + 1];
46+
$data[] = isset($loc[$i + 1]) ? $loc[$i + 1] : 0;
4747
}
4848
}
4949
}

0 commit comments

Comments
 (0)