Merge remote-tracking branch 'origin/master'

Author: PhenX

.travis.yml

@@ -7,7 +7,15 @@ env:
 php:
     - 5.4
     - 5.5
+    - 5.6
+    - 7.0
+    - hhvm
 
+matrix:
+  allow_failures:
+    - php: hhvm
+  fast_finish: true
+  
 before_script:
     - composer dump-autoload
     - composer self-update
@@ -18,4 +26,4 @@ script: bin/phpunit
 
 # Use Travis' new container-based infrastructure.
 # See http://docs.travis-ci.com/user/migrating-from-legacy/#How-can-I-use-container-based-infrastructure%3F
-sudo: false
+sudo: false

src/FontLib/BinaryStream.php

@@ -157,6 +157,10 @@ public function readUInt8() {
     return ord($this->read(1));
   }
 
+  public function readUInt8Many($count) {
+    return array_values(unpack("C*", $this->read($count)));
+  }
+
   public function writeUInt8($data) {
     return $this->write(chr($data), 1);
   }
@@ -171,6 +175,10 @@ public function readInt8() {
     return $v;
   }
 
+  public function readInt8Many($count) {
+    return array_values(unpack("c*", $this->read($count)));
+  }
+
   public function writeInt8($data) {
     if ($data < 0) {
       $data += 0x100;
@@ -185,6 +193,10 @@ public function readUInt16() {
     return $a["n"];
   }
 
+  public function readUInt16Many($count) {
+    return array_values(unpack("n*", $this->read($count * 2)));
+  }
+
   public function readUFWord() {
     return $this->readUInt16();
   }
@@ -198,7 +210,8 @@ public function writeUFWord($data) {
   }
 
   public function readInt16() {
-    $v = $this->readUInt16();
+    $a = unpack("nn", $this->read(2));
+    $v = $a["n"];
 
     if ($v >= 0x8000) {
       $v -= 0x10000;
@@ -207,6 +220,17 @@ public function readInt16() {
     return $v;
   }
 
+  public function readInt16Many($count) {
+    $vals = array_values(unpack("n*", $this->read($count * 2)));
+    foreach ($vals as &$v) {
+      if ($v >= 0x8000) {
+        $v -= 0x10000;
+      }
+    }
+
+    return $vals;
+  }
+
   public function readFWord() {
     return $this->readInt16();
   }
@@ -251,6 +275,12 @@ public function readLongDateTime() {
     $this->readUInt32(); // ignored
     $date = $this->readUInt32() - 2082844800;
 
+    if ($date > PHP_INT_MAX) {
+      $date = PHP_INT_MAX;
+    } elseif ($date < PHP_INT_MIN) {
+      $date = PHP_INT_MIN;
+    }
+
     return strftime("%Y-%m-%d %H:%M:%S", $date);
   }
 
@@ -319,6 +349,18 @@ public function r($type) {
           if ($type[0] == self::char) {
             return $this->read($type[1]);
           }
+          if ($type[0] == self::uint16) {
+            return $this->readUInt16Many($type[1]);
+          }
+          if ($type[0] == self::int16) {
+            return $this->readInt16Many($type[1]);
+          }
+          if ($type[0] == self::uint8) {
+            return $this->readUInt8Many($type[1]);
+          }
+          if ($type[0] == self::int8) {
+            return $this->readInt8Many($type[1]);
+          }
 
           $ret = array();
           for ($i = 0; $i < $type[1]; $i++) {

src/FontLib/Glyph/Outline.php

@@ -42,8 +42,7 @@ class Outline extends BinaryStream {
    *
    * @return Outline
    */
-  static function init(glyf $table, $offset, $size) {
-    $font = $table->getFont();
+  static function init(glyf $table, $offset, $size, BinaryStream $font) {
     $font->seek($offset);
 
     if ($font->readInt16() > -1) {
@@ -55,7 +54,7 @@ static function init(glyf $table, $offset, $size) {
       $glyph = new OutlineComposite($table, $offset, $size);
     }
 
-    $glyph->parse();
+    $glyph->parse($font);
 
     return $glyph;
   }
@@ -73,8 +72,7 @@ function __construct(glyf $table, $offset = null, $size = null) {
     $this->size   = $size;
   }
 
-  function parse() {
-    $font = $this->getFont();
+  function parse(BinaryStream $font) {
     $font->seek($this->offset);
 
     if (!$this->size) {

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/glyf.php

@@ -31,7 +31,7 @@ protected function _parse() {
     foreach ($real_loca as $gid => $location) {
       $_offset    = $offset + $loca[$gid];
       $_size      = $loca[$gid + 1] - $loca[$gid];
-      $data[$gid] = Outline::init($this, $_offset, $_size);
+      $data[$gid] = Outline::init($this, $_offset, $_size, $font);
     }
 
     $this->data = $data;

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/name.php

@@ -73,7 +73,7 @@ class name extends Table {
     3 => "Microsoft",
   );
 
-  static $plaformSpecific = array(
+  static $platformSpecific = array(
     // Unicode
     0 => array(
       0 => "Default semantics",
@@ -190,4 +190,4 @@ protected function _encode() {
 
     return $length;
   }
-}
+}

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;