Update tecnick/tcpdf from 6.2.4 to 6.2.5

9 files changed, 36 insertions, 31 deletions

diff --git a/library/autoload.php b/library/autoload.php
index aa2c3d5d80..6abc1216ad 100644
--- a/library/autoload.php
+++ b/library/autoload.php
@@ -4,4 +4,4 @@
 
 require_once __DIR__ . '/composer' . '/autoload_real.php';
 
-return ComposerAutoloaderInitd76390a95e11cccd9252fa09d9a2c961::getLoader();
+return ComposerAutoloaderInite4dde4f6c7b2f366e5b942ab83f61744::getLoader();
diff --git a/library/composer/autoload_real.php b/library/composer/autoload_real.php
index cbee7dc811..b29eb0b50c 100644
--- a/library/composer/autoload_real.php
+++ b/library/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitd76390a95e11cccd9252fa09d9a2c961
+class ComposerAutoloaderInite4dde4f6c7b2f366e5b942ab83f61744
 {
     private static $loader;
 
@@ -19,9 +19,9 @@ class ComposerAutoloaderInitd76390a95e11cccd9252fa09d9a2c961
             return self::$loader;
         }
 
-        spl_autoload_register(array('ComposerAutoloaderInitd76390a95e11cccd9252fa09d9a2c961', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInite4dde4f6c7b2f366e5b942ab83f61744', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader();
-        spl_autoload_unregister(array('ComposerAutoloaderInitd76390a95e11cccd9252fa09d9a2c961', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInite4dde4f6c7b2f366e5b942ab83f61744', 'loadClassLoader'));
 
         $includePaths = require __DIR__ . '/include_paths.php';
         array_push($includePaths, get_include_path());
@@ -46,14 +46,14 @@ class ComposerAutoloaderInitd76390a95e11cccd9252fa09d9a2c961
 
         $includeFiles = require __DIR__ . '/autoload_files.php';
         foreach ($includeFiles as $file) {
-            composerRequired76390a95e11cccd9252fa09d9a2c961($file);
+            composerRequiree4dde4f6c7b2f366e5b942ab83f61744($file);
         }
 
         return $loader;
     }
 }
 
-function composerRequired76390a95e11cccd9252fa09d9a2c961($file)
+function composerRequiree4dde4f6c7b2f366e5b942ab83f61744($file)
 {
     require $file;
 }
diff --git a/library/composer/installed.json b/library/composer/installed.json
index a0d0fd8697..282538c08b 100644
--- a/library/composer/installed.json
+++ b/library/composer/installed.json
@@ -385,23 +385,23 @@
     },
     {
         "name": "tecnick.com/tcpdf",
-        "version": "6.2.4",
-        "version_normalized": "6.2.4.0",
+        "version": "6.2.5",
+        "version_normalized": "6.2.5.0",
         "source": {
             "type": "git",
             "url": "https://github.com/tecnickcom/TCPDF.git",
-            "reference": "ba2afad72c6191bfed735dfa357bcaf3f225f52b"
+            "reference": "da2fe9359426ca334417549248307f33cd042ace"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/ba2afad72c6191bfed735dfa357bcaf3f225f52b",
-            "reference": "ba2afad72c6191bfed735dfa357bcaf3f225f52b",
+            "url": "https://api.github.com/repos/tecnickcom/TCPDF/zipball/da2fe9359426ca334417549248307f33cd042ace",
+            "reference": "da2fe9359426ca334417549248307f33cd042ace",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3.0"
         },
-        "time": "2015-01-08 18:35:22",
+        "time": "2015-01-24 09:41:10",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
diff --git a/library/tecnick.com/tcpdf/CHANGELOG.TXT b/library/tecnick.com/tcpdf/CHANGELOG.TXT
index 09e50bd962..5625dc15d8 100644
--- a/library/tecnick.com/tcpdf/CHANGELOG.TXT
+++ b/library/tecnick.com/tcpdf/CHANGELOG.TXT
@@ -1,3 +1,7 @@
+6.2.5 (2015-01-24)
+	- Bug #1019 "$this in static context" was fixed.
+	- Bug #1015 "Infinite loop in getIndirectObject method of parser" was fixed.
+
 6.2.4 (2015-01-08)
 	- fix warning related to empty K_PATH_URL.
 	- fix error when a $table_colwidths key is not set.
diff --git a/library/tecnick.com/tcpdf/README.TXT b/library/tecnick.com/tcpdf/README.TXT
index 5d2616466d..b8deb9fdaa 100644
--- a/library/tecnick.com/tcpdf/README.TXT
+++ b/library/tecnick.com/tcpdf/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 6.2.4
-Release date: 2015-01-08
+Version: 6.2.5
+Release date: 2015-01-24
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2015:
diff --git a/library/tecnick.com/tcpdf/composer.json b/library/tecnick.com/tcpdf/composer.json
index f0aceda9dd..ca4e0bf2c5 100644
--- a/library/tecnick.com/tcpdf/composer.json
+++ b/library/tecnick.com/tcpdf/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tecnick.com/tcpdf",
-	"version": "6.2.4",
+	"version": "6.2.5",
 	"homepage": "http://www.tcpdf.org/",
 	"type": "library",
 	"description": "TCPDF is a PHP class for generating PDF documents and barcodes.",
diff --git a/library/tecnick.com/tcpdf/include/tcpdf_static.php b/library/tecnick.com/tcpdf/include/tcpdf_static.php
index cd86680ed4..da0a5e7a23 100644
--- a/library/tecnick.com/tcpdf/include/tcpdf_static.php
+++ b/library/tecnick.com/tcpdf/include/tcpdf_static.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf_static.php
-// Version     : 1.1.1
+// Version     : 1.1.2
 // Begin       : 2002-08-03
-// Last Update : 2015-01-08
+// Last Update : 2015-01-24
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -38,7 +38,7 @@
  * This is a PHP class that contains static methods for the TCPDF class.<br>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 1.1.1
+ * @version 1.1.2
  */
 
 /**
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.2.3';
+	private static $tcpdf_version = '6.2.5';
 
 	/**
 	 * String alias for total number of pages.
@@ -2435,7 +2435,7 @@ class TCPDF_STATIC {
 		if (strpos($filename, '://') === false) {
 			$filename = 'file://'.$filename;
 		} elseif (strpos($filename, 'file://') !== 0) {
-			$this->Error('Unsupported file protocol');
+			return false;
 		}
 		return fopen($filename, $mode);
 	}
diff --git a/library/tecnick.com/tcpdf/tcpdf.php b/library/tecnick.com/tcpdf/tcpdf.php
index 0a9f011289..e5d314cf42 100644
--- a/library/tecnick.com/tcpdf/tcpdf.php
+++ b/library/tecnick.com/tcpdf/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.2.4
+// Version     : 6.2.5
 // Begin       : 2002-08-03
-// Last Update : 2015-01-08
+// Last Update : 2015-01-24
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -104,7 +104,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 6.2.4
+ * @version 6.2.5
  */
 
 // TCPDF configuration
@@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
  * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 6.2.4
+ * @version 6.2.5
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF {
diff --git a/library/tecnick.com/tcpdf/tcpdf_parser.php b/library/tecnick.com/tcpdf/tcpdf_parser.php
index f80d3eeb8a..85fc7fd3df 100644
--- a/library/tecnick.com/tcpdf/tcpdf_parser.php
+++ b/library/tecnick.com/tcpdf/tcpdf_parser.php
@@ -1,13 +1,13 @@
 <?php
 //============================================================+
 // File name   : tcpdf_parser.php
-// Version     : 1.0.014
+// Version     : 1.0.15
 // Begin       : 2011-05-23
-// Last Update : 2014-02-18
+// Last Update : 2015-01-24
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
 // -------------------------------------------------------------------
-// Copyright (C) 2011-2014 Nicola Asuni - Tecnick.com LTD
+// Copyright (C) 2011-2015 Nicola Asuni - Tecnick.com LTD
 //
 // This file is part of TCPDF software library.
 //
@@ -37,7 +37,7 @@
  * This is a PHP class for parsing PDF documents.<br>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 1.0.014
+ * @version 1.0.15
  */
 
 // include class for decoding filters
@@ -48,7 +48,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_filters.php');
  * This is a PHP class for parsing PDF documents.<br>
  * @package com.tecnick.tcpdf
  * @brief This is a PHP class for parsing PDF documents..
- * @version 1.0.010
+ * @version 1.0.15
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF_PARSER {
@@ -690,7 +690,8 @@ class TCPDF_PARSER {
 		$objdata = array();
 		$i = 0; // object main index
 		do {
-			// get element
+			$oldoffset = $offset;
+                        // get element
 			$element = $this->getRawObject($offset);
 			$offset = $element[2];
 			// decode stream using stream's dictionary information
@@ -699,7 +700,7 @@ class TCPDF_PARSER {
 			}
 			$objdata[$i] = $element;
 			++$i;
-		} while ($element[0] != 'endobj');
+		} while (($element[0] != 'endobj') AND ($offset != $oldoffset));
 		// remove closing delimiter
 		array_pop($objdata);
 		// return raw object content