Merge pull request #5 from LibreCodeCoop/develop

Develop

Author: vitormattos

.gitignore

@@ -0,0 +1 @@
+/vendor/

composer.json

@@ -0,0 +1,19 @@
+{
+    "name": "librecode/tcpdi_parser",
+    "license": "LGPL-3.0-or-later",
+    "autoload": {
+        "psr-4": {
+            "LibreCode\\TcpdiParser\\": "src/"
+        }
+    },
+    "authors": [
+        {
+            "name": "Vitor Mattos",
+            "email": "vitor@php.rio"
+        },
+        {
+            "name": "Paul Nicholls",
+            "homepage": "https://github.com/pauln"
+        }
+    ]
+}

tcpdi_parser.php renamed to src/tcpdi_parser.php

@@ -1,4 +1,7 @@
 <?php
+
+namespace Librecode\TcpdiParser;
+
 //============================================================+
 // File name   : tcpdi_parser.php
 // Version     : 1.1
@@ -483,7 +486,7 @@ protected function decodeXrefStream($startxref, $xref=array()) {
             $v = $sarr[$key];
             if (($key == '/Type') AND ($v[0] == PDF_TYPE_TOKEN AND ($v[1] == 'XRef'))) {
                 $valid_crs = true;
-            } elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND count($v[1] >= 2))) {
+            } elseif (($key == '/Index') AND ($v[0] == PDF_TYPE_ARRAY AND (count($v[1]) >= 2))) {
                 // first object number in the subsection
                 $index_first = intval($v[1][0][1]);
                 // number of entries in the subsection
@@ -709,20 +712,19 @@ protected function getRawObject($offset=0, $data=null) {
         $objtype = ''; // object type to be returned
         $objval = ''; // object value to be returned
         // skip initial white space chars: \x00 null (NUL), \x09 horizontal tab (HT), \x0A line feed (LF), \x0C form feed (FF), \x0D carriage return (CR), \x20 space (SP)
-        while (strspn($data{$offset}, "\x00\x09\x0a\x0c\x0d\x20") == 1) {
+        while (strspn($data[$offset], "\x00\x09\x0a\x0c\x0d\x20")) {
             $offset++;
         }
         // get first char
-        $char = $data{$offset};
+        $char = $data[$offset];
         // get object type
         switch ($char) {
             case '%': { // \x25 PERCENT SIGN
                 // skip comment and search for next token
                 $next = strcspn($data, "\r\n", $offset);
                 if ($next > 0) {
                     $offset += $next;
-                    list($obj, $unused) = $this->getRawObject($offset, $data);
-                    return $obj;
+                    return $this->getRawObject($offset, $data);
                 }
                 break;
             }
@@ -744,10 +746,10 @@ protected function getRawObject($offset=0, $data=null) {
                 if ($char == '(') {
                     $open_bracket = 1;
                     while ($open_bracket > 0) {
-                        if (!isset($data{$strpos})) {
+                        if (!isset($data[$strpos])) {
                             break;
                         }
-                        $ch = $data{$strpos};
+                        $ch = $data[$strpos];
                         switch ($ch) {
                             case '\\': { // REVERSE SOLIDUS (5Ch) (Backslash)
                                 // skip next character
@@ -792,7 +794,7 @@ protected function getRawObject($offset=0, $data=null) {
             }
             case '<':   // \x3C LESS-THAN SIGN
             case '>': { // \x3E GREATER-THAN SIGN
-                if (isset($data{($offset + 1)}) AND ($data{($offset + 1)} == $char)) {
+                if (isset($data[($offset + 1)]) AND ($data[($offset + 1)] == $char)) {
                     // dictionary object
                     $objtype = PDF_TYPE_DICTIONARY;
                     if ($char == '<') {
@@ -809,13 +811,16 @@ protected function getRawObject($offset=0, $data=null) {
                     if (($char == '<') AND (preg_match('/^([0-9A-Fa-f ]+)[>]/iU', substr($data, $offset), $matches) == 1)) {
                         $objval = $matches[1];
                         $offset += strlen($matches[0]);
-                        unset($matches);
+                    } else if (($char == '<') AND ($endpos = strpos($this->pdfdata, '>', $offset)) !== FALSE) {
+                        $objval = substr($data, $offset,$endpos-$offset);
+                        $offset = $endpos + 1;
                     }
+                    unset($matches);
                 }
                 break;
             }
             default: {
-                $frag = $data{$offset} . @$data{$offset+1} . @$data{$offset+2} . @$data{$offset+3};
+                $frag = $data[$offset] . @$data[$offset+1] . @$data[$offset+2] . @$data[$offset+3];
                 switch ($frag) {
                     case 'endo':
                         // indirect object
@@ -888,20 +893,25 @@ private function getDictValue($offset, &$data) {
         $objval = array();
 
         // Extract dict from data.
-        $i=1;
+        $i=2;
         $dict = '';
         $offset += 2;
         do {
-            if ($data{$offset} == '>' && $data{$offset+1} == '>') {
-                $i--;
+            if ($data[$offset] == '>' && $data[$offset+1] == '>') {
+                $i -= 2;
                 $dict .= '>>';
                 $offset += 2;
-            } else if ($data{$offset} == '<' && $data{$offset+1} == '<') {
-                $i++;
+            } else if ($data[$offset] == '<' && $data[$offset+1] == '<') {
+                $i += 2;
                 $dict .= '<<';
                 $offset += 2;
             } else {
-                $dict .= $data{$offset};
+                if ($data[$offset] == '<') {
+                    $i++;
+                } else if ($data[$offset] == '>') {
+                    $i--;
+                }
+                $dict .= $data[$offset];
                 $offset++;
             }
         } while ($i>0);
@@ -1441,7 +1451,7 @@ private function _getPageRotation($obj) { // $obj = /Page
      */
     public function Error($msg) {
         // exit program and print error
-        die("<strong>TCPDI_PARSER ERROR [{$this->uniqueid}]: </strong>".$msg);
+        throw new Exception("<strong>TCPDI_PARSER ERROR [{$this->uniqueid}]: </strong>".$msg);
     }
 
 } // END OF TCPDF_PARSER CLASS