diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 09e50bd..5625dc1 100644
--- a/CHANGELOG.TXT
+++ b/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/README.TXT b/README.TXT
index 5d26164..b8deb9f 100644
--- a/README.TXT
+++ b/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/composer.json b/composer.json
index f0aceda..ca4e0bf 100644
--- a/composer.json
+++ b/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/include/tcpdf_static.php b/include/tcpdf_static.php
index cd86680..da0a5e7 100644
--- a/include/tcpdf_static.php
+++ b/include/tcpdf_static.php
@@ -1,9 +1,9 @@
* @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/tcpdf.php b/tcpdf.php
index 0a9f011..e5d314c 100644
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
* @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.
* @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/tcpdf_parser.php b/tcpdf_parser.php
index f80d3ee..85fc7fd 100644
--- a/tcpdf_parser.php
+++ b/tcpdf_parser.php
@@ -1,13 +1,13 @@
* @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.
* @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