From c4e39163a7f0c4c937ac82d47ce14608af201fe7 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Wed, 27 Mar 2013 18:33:18 +0000 Subject: [PATCH] 6.0.006 (2013-03-27) - Bug related to SVG and EPS files on xobjects were fixed. --- CHANGELOG.TXT | 3 +++ README.TXT | 4 ++-- composer.json | 2 +- include/tcpdf_static.php | 4 ++-- tcpdf.php | 8 ++++---- 5 files changed, 12 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 3954260..5760200 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +6.0.006 (2013-03-27) + - Bug related to SVG and EPS files on xobjects were fixed. + 6.0.005 (2013-03-26) - Default font path was fixed. diff --git a/README.TXT b/README.TXT index ebdff42..bb56294 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 6.0.005 -Release date: 2013-03-26 +Version: 6.0.006 +Release date: 2013-03-27 Author: Nicola Asuni Copyright (c) 2002-2013: diff --git a/composer.json b/composer.json index a466b14..0a8e9cb 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.005", + "version": "6.0.006", "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 e4b91b3..e01d0a7 100644 --- a/include/tcpdf_static.php +++ b/include/tcpdf_static.php @@ -3,7 +3,7 @@ // File name : tcpdf_static.php // Version : 1.0.000 // Begin : 2002-08-03 -// Last Update : 2013-03-26 +// Last Update : 2013-03-27 // Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 // ------------------------------------------------------------------- @@ -55,7 +55,7 @@ class TCPDF_STATIC { * Current TCPDF version. * @private static */ - private static $tcpdf_version = '6.0.005'; + private static $tcpdf_version = '6.0.006'; /** * String alias for total number of pages. diff --git a/tcpdf.php b/tcpdf.php index 353aaba..17d14fa 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,7 +1,7 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.0.005 + * @version 6.0.006 */ if (!defined('K_TCPDF_EXTERNAL_CONFIG')) { @@ -168,7 +168,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.005 + * @version 6.0.006 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -9200,7 +9200,7 @@ class TCPDF { protected function _putxobjects() { foreach ($this->xobjects as $key => $data) { if (isset($data['outdata'])) { - $stream = trim($data['outdata']); + $stream = str_replace($this->epsmarker, '', trim($data['outdata'])); $out = $this->_getobj($data['n'])."\n"; $out .= '<<'; $out .= ' /Type /XObject';