Merge pull request #35 from efbiaiinzinz/master

Use the multi-read helpers to reduce big font parsing time by ~40%

Author: PhenX

src/FontLib/Table/Type/cmap.php

@@ -64,15 +64,15 @@ protected function _parse() {
       $segCount             = $subtable["segCountX2"] / 2;
       $subtable["segCount"] = $segCount;
 
-      $endCode = $font->r(array(self::uint16, $segCount));
+      $endCode = $font->readUInt16Many($segCount);
 
       $font->readUInt16(); // reservedPad
 
-      $startCode = $font->r(array(self::uint16, $segCount));
-      $idDelta   = $font->r(array(self::int16, $segCount));
+      $startCode = $font->readUInt16Many($segCount);
+      $idDelta   = $font->readInt16Many($segCount);
 
       $ro_start      = $font->pos();
-      $idRangeOffset = $font->r(array(self::uint16, $segCount));
+      $idRangeOffset = $font->readUInt16Many($segCount);
 
       $glyphIndexArray = array();
       for ($i = 0; $i < $segCount; $i++) {

src/FontLib/Table/Type/hmtx.php

@@ -25,9 +25,10 @@ protected function _parse() {
     $font->seek($offset);
 
     $data = array();
-    for ($gid = 0; $gid < $numOfLongHorMetrics; $gid++) {
-      $advanceWidth    = $font->readUInt16();
-      $leftSideBearing = $font->readUInt16();
+    $metrics = $font->readUInt16Many($numOfLongHorMetrics * 2);
+    for ($gid = 0, $mid = 0; $gid < $numOfLongHorMetrics; $gid++) {
+      $advanceWidth    = $metrics[$mid++];
+      $leftSideBearing = $metrics[$mid++];
       $data[$gid]      = array($advanceWidth, $leftSideBearing);
     }
 

src/FontLib/Table/Type/kern.php

@@ -44,10 +44,15 @@ protected function _parse() {
         $pairs = array();
         $tree  = array();
 
-        for ($i = 0; $i < $subtable["nPairs"]; $i++) {
-          $left  = $font->readUInt16();
-          $right = $font->readUInt16();
-          $value = $font->readInt16();
+        $values = $font->readUInt16Many($subtable["nPairs"] * 3);
+        for ($i = 0, $idx = 0; $i < $subtable["nPairs"]; $i++) {
+          $left  = $values[$idx++];
+          $right = $values[$idx++];
+          $value = $values[$idx++];
+
+          if ($value >= 0x8000) {
+            $value -= 0x10000;
+          }
 
           $pairs[] = array(
             "left"  => $left,

src/FontLib/Table/Type/post.php

@@ -42,10 +42,7 @@ protected function _parse() {
       case 2:
         $data["numberOfGlyphs"] = $font->readUInt16();
 
-        $glyphNameIndex = array();
-        for ($i = 0; $i < $data["numberOfGlyphs"]; $i++) {
-          $glyphNameIndex[] = $font->readUInt16();
-        }
+        $glyphNameIndex = $font->readUInt16Many($data["numberOfGlyphs"]);
 
         $data["glyphNameIndex"] = $glyphNameIndex;