Update to FPDI 1.6.2

denikod · May 11, 2017 · a6ad588 · a6ad588
1 parent 5b899b2
commit a6ad588
Show file tree

Hide file tree

Showing 12 changed files with 66 additions and 39 deletions.
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015 Setasign - Jan Slabon, https://www.setasign.com
+Copyright (c) 2017 Setasign - Jan Slabon, https://www.setasign.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -17,15 +17,15 @@ This package comes without any dependency configuration in the composer.json fil
 A basic installation via Composer could be done this way:
 
 ```bash
-$ composer require setasign/fpdi:1.6.1
+$ composer require setasign/fpdi:1.6.2
 ```
 
 or you can include the following in your composer.json file:
 
 ```json
 {
     "require": {
-        "setasign/fpdi": "1.6.1"
+        "setasign/fpdi": "1.6.2"
     }
 }
 ```
@@ -37,7 +37,7 @@ To load dependencies automatically we prepared kind of metadata packages. To use
 ```json
 {
     "require": {
-        "setasign/fpdi-fpdf": "1.6.1"
+        "setasign/fpdi-fpdf": "1.6.2"
     }
 }
 ```
@@ -47,7 +47,7 @@ For TCPDF use [this](https://github.com/Setasign/FPDI-TCPDF):
 ```json
 {
     "require": {
-        "setasign/fpdi-tcpdf": "1.6.1"
+        "setasign/fpdi-tcpdf": "1.6.2"
     }
 }
 ```
@@ -62,7 +62,7 @@ To use FPDI with FPDF include following in your composer.json file:
 {
     "require": {
         "setasign/fpdf": "1.8",
-        "setasign/fpdi": "1.6.1"
+        "setasign/fpdi": "1.6.2"
     }
 }
 ```
@@ -72,8 +72,8 @@ If you are using TCPDF, your have to update your composer.json respectively to:
 ```json
 {
     "require": {
-        "tecnickcom/tcpdf": "6.2.12",
-        "setasign/fpdi": "1.6.1"
+        "tecnickcom/tcpdf": "6.2.13",
+        "setasign/fpdi": "1.6.2"
     }
 }
 ```

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "setasign/fpdi",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "homepage": "https://www.setasign.com/fpdi",
   "description": "FPDI is a collection of PHP classes facilitating developers to read pages from existing PDF documents and use them as templates in FPDF. Because it is also possible to use FPDI with TCPDF, there are no fixed dependencies defined. Please see suggestions for packages which evaluates the dependencies automatically.",
   "type": "library",

diff --git a/filters/FilterASCII85.php b/filters/FilterASCII85.php
@@ -3,9 +3,9 @@
  * This file is part of FPDI
  *
  * @package   FPDI
- * @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
+ * @copyright Copyright (c) 2017 Setasign - Jan Slabon (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
- * @version   1.6.1
+ * @version   1.6.2
  */
 
 /**

diff --git a/filters/FilterASCIIHexDecode.php b/filters/FilterASCIIHexDecode.php
@@ -3,9 +3,9 @@
  * This file is part of FPDI
  *
  * @package   FPDI
- * @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
+ * @copyright Copyright (c) 2017 Setasign - Jan Slabon (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
- * @version   1.6.1
+ * @version   1.6.2
  */
 
 /**

diff --git a/filters/FilterLZW.php b/filters/FilterLZW.php
@@ -3,9 +3,9 @@
  * This file is part of FPDI
  *
  * @package   FPDI
- * @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
+ * @copyright Copyright (c) 2017 Setasign - Jan Slabon (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
- * @version   1.6.1
+ * @version   1.6.2
  */
 
 /**

diff --git a/fpdf_tpl.php b/fpdf_tpl.php
@@ -3,9 +3,9 @@
  * This file is part of FPDI
  *
  * @package   FPDI
- * @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
+ * @copyright Copyright (c) 2017 Setasign - Jan Slabon (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
- * @version   1.6.1
+ * @version   1.6.2
  */
 
 if (!class_exists('fpdi_bridge')) {

diff --git a/fpdi.php b/fpdi.php
@@ -3,9 +3,9 @@
  * This file is part of FPDI
  *
  * @package   FPDI
- * @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
+ * @copyright Copyright (c) 2017 Setasign - Jan Slabon (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
- * @version   1.6.1
+ * @version   1.6.2
  */
 
 if (!class_exists('FPDF_TPL')) {
@@ -22,7 +22,7 @@ class FPDI extends FPDF_TPL
      *
      * @string
      */
-    const VERSION = '1.6.1';
+    const VERSION = '1.6.2';
 
     /**
      * Actual filename
@@ -88,23 +88,35 @@ class FPDI extends FPDF_TPL
      *
      * @param string $filename A valid path to the PDF document from which pages should be imported from
      * @return int The number of pages in the document
+     * @throws Exception
      */
     public function setSourceFile($filename)
     {
         $_filename = realpath($filename);
         if (false !== $_filename)
             $filename = $_filename;
 
-        $this->currentFilename = $filename;
-
-        if (!isset($this->parsers[$filename])) {
-            $this->parsers[$filename] = $this->_getPdfParser($filename);
-            $this->setPdfVersion(
-                max($this->getPdfVersion(), $this->parsers[$filename]->getPdfVersion())
-            );
-        }
+        $currentFilename = $this->currentFilename;
+        $currentParser = $this->currentParser;
 
-        $this->currentParser = $this->parsers[$filename];
+        try {
+            $this->currentFilename = $filename;
+
+            if (!isset($this->parsers[$filename])) {
+                $this->parsers[$filename] = $this->_getPdfParser($filename);
+                $this->setPdfVersion(
+                    max($this->getPdfVersion(), $this->parsers[$filename]->getPdfVersion())
+                );
+            }
+
+            $this->currentParser = $this->parsers[$filename];
+
+        } catch (Exception $e) {
+            unset($this->parsers[$filename]);
+            $this->currentFilename = $currentFilename;
+            $this->currentParser = $currentParser;
+            throw $e;
+        }
 
         return $this->parsers[$filename]->getPageCount();
     }

diff --git a/fpdi_bridge.php b/fpdi_bridge.php
@@ -3,9 +3,9 @@
  * This file is part of FPDI
  *
  * @package   FPDI
- * @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
+ * @copyright Copyright (c) 2017 Setasign - Jan Slabon (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
- * @version   1.6.1
+ * @version   1.6.2
  */
 
 /**

diff --git a/fpdi_pdf_parser.php b/fpdi_pdf_parser.php
@@ -3,9 +3,9 @@
  * This file is part of FPDI
  *
  * @package   FPDI
- * @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
+ * @copyright Copyright (c) 2017 Setasign - Jan Slabon (http://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
- * @version   1.6.1
+ * @version   1.6.2
  */
 
 if (!class_exists('pdf_parser')) {
@@ -155,6 +155,10 @@ public function getContent()
         if (isset($this->_pages[$this->pageNo][1][1]['/Contents'])) {
             $contents = $this->_getPageContent($this->_pages[$this->pageNo][1][1]['/Contents']);
             foreach ($contents AS $tmpContent) {
+                if ($tmpContent[0] !== pdf_parser::TYPE_STREAM) {
+                    continue;
+                }
+
                 $buffer .= $this->_unFilterStream($tmpContent) . ' ';
             }
         }
@@ -335,6 +339,10 @@ protected function _readPages(&$pages, &$result)
 
         foreach ($kids as $v) {
             $pg = $this->resolveObject($v);
+            if ($pg[0] !== pdf_parser::TYPE_OBJECT) {
+                throw new Exception('Invalid data type in page tree.');
+            }
+
             if ($pg[1][1]['/Type'][1] === '/Pages') {
                 // If one of the kids is an embedded
                 // /Pages array, resolve it as well.

diff --git a/pdf_context.php b/pdf_context.php
@@ -3,9 +3,9 @@
  * This file is part of FPDI
  *
  * @package   FPDI
- * @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
+ * @copyright Copyright (c) 2017 Setasign - Jan Slabon (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
- * @version   1.6.1
+ * @version   1.6.2
  */
 
 /**
@@ -67,7 +67,14 @@ public function __construct(&$f)
     public function getPos()
     {
         if ($this->_mode == 0) {
-            return ftell($this->file);
+            if (feof($this->file)) {
+                $stat = fstat($this->file);
+                fseek($this->file, $stat['size']);
+            }
+
+            $pos = ftell($this->file);
+
+            return $pos;
         } else {
             return 0;
         }
@@ -85,7 +92,7 @@ public function reset($pos = null, $l = 100)
     {
         if ($this->_mode == 0) {
             if (!is_null($pos)) {
-                fseek ($this->file, $pos);
+                fseek($this->file, $pos);
             }
 
             $this->buffer = $l > 0 ? fread($this->file, $l) : '';

diff --git a/pdf_parser.php b/pdf_parser.php
@@ -3,9 +3,9 @@
  * This file is part of FPDI
  *
  * @package   FPDI
- * @copyright Copyright (c) 2015 Setasign - Jan Slabon (http://www.setasign.com)
+ * @copyright Copyright (c) 2017 Setasign - Jan Slabon (https://www.setasign.com)
  * @license   http://opensource.org/licenses/mit-license The MIT License
- * @version   1.6.1
+ * @version   1.6.2
  */
 
 /**