From ee71246dff8aaf04c649e67c5b457aff2d81d643 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Sun, 26 Jan 2014 14:35:08 +0000 Subject: [PATCH] 6.0.057 (2014-01-26) - Bug #883 "Parsing error" was fixed. --- CHANGELOG.TXT | 5 ++++- README.TXT | 4 ++-- composer.json | 2 +- include/tcpdf_static.php | 2 +- tcpdf.php | 6 +++--- tcpdf_parser.php | 3 +-- 6 files changed, 12 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index e345c2b..fd517d9 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,5 +1,8 @@ +6.0.057 (2014-01-26) + - Bug #883 "Parsing error" was fixed. + 6.0.056 (2014-01-25) - - The automatic chache folder selection now works also with some restricted hosting environments. + - The automatic cache folder selection now works also with some restricted hosting environments. - CSS text-transform property is now supported (requires the multibyte string library for php) - see examle n. 061 (Thanks to Walter Ferraz). - Bug #884 "Parsing error prev tag looking for" was fixed. diff --git a/README.TXT b/README.TXT index c370024..50d74d1 100644 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 6.0.056 -Release date: 2014-01-25 +Version: 6.0.057 +Release date: 2014-01-26 Author: Nicola Asuni Copyright (c) 2002-2014: diff --git a/composer.json b/composer.json index a4a2b70..d6638b1 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.056", + "version": "6.0.057", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents.", diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php index d5a0050..f4bb878 100644 --- a/include/tcpdf_static.php +++ b/include/tcpdf_static.php @@ -55,7 +55,7 @@ class TCPDF_STATIC { * Current TCPDF version. * @private static */ - private static $tcpdf_version = '6.0.056'; + private static $tcpdf_version = '6.0.057'; /** * String alias for total number of pages. diff --git a/tcpdf.php b/tcpdf.php index 6cd47c6..cb80f9f 100644 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,7 +1,7 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.0.056 + * @version 6.0.057 */ // 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.0.056 + * @version 6.0.057 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { diff --git a/tcpdf_parser.php b/tcpdf_parser.php index c1fa0d5..86c9ce6 100644 --- a/tcpdf_parser.php +++ b/tcpdf_parser.php @@ -439,7 +439,6 @@ class TCPDF_PARSER { foreach ($sdata as $k => $row) { switch ($row[0]) { case 0: { // (f) linked list of free objects - ++$obj_num; break; } case 1: { // (n) objects that are in use but are not compressed @@ -450,7 +449,6 @@ class TCPDF_PARSER { // store object offset position $xref['xref'][$index] = $row[1]; } - ++$obj_num; break; } case 2: { // compressed objects @@ -464,6 +462,7 @@ class TCPDF_PARSER { break; } } + ++$obj_num; } } // end decoding data if (isset($prevxref)) {