Merge pull request #34 from efbiaiinzinz/master

Optimized versions of uint16/int16/uint8/int8 multi-readers

Author: PhenX

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();
   }
@@ -207,6 +219,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();
   }
@@ -319,6 +342,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++) {