From d2ded0b6988355227ffd4ac29522b3f45e8ea4e5 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Sun, 24 Nov 2013 18:56:31 +0000 Subject: [PATCH] 6.0.048 (2013-11-24) - SVG vars are now reset in ImageSVG() method. --- CHANGELOG.TXT | 3 +++ README.TXT | 4 ++-- composer.json | 2 +- tcpdf.php | 15 +++++++++++++-- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 443fa84..a6a4441 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +6.0.048 (2013-11-24) + - SVG vars are now reset in ImageSVG() method. + 6.0.047 (2013-11-19) - SVG support was extended to support some nested defs. diff --git a/README.TXT b/README.TXT index b7c49e4..cf4cc21 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.047 -Release date: 2013-11-19 +Version: 6.0.048 +Release date: 2013-11-24 Author: Nicola Asuni Copyright (c) 2002-2013: diff --git a/composer.json b/composer.json index f5ddb46..99d8844 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.047", + "version": "6.0.048", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents.", diff --git a/tcpdf.php b/tcpdf.php index a69ca65..53eca68 100644 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ state != 2) { return; } + // reseet SVG vars + $this->svggradients = array(); + $this->svggradientid = 0; + $this->svgdefsmode = false; + $this->svgdefs = array(); + $this->svgclipmode = false; + $this->svgclippaths = array(); + $this->svgcliptm = array(); + $this->svgclipid = 0; + $this->svgtext = ''; + $this->svgtextmode = array(); if ($this->rasterize_vector_images AND ($w > 0) AND ($h > 0)) { // convert SVG to raster image using GD or ImageMagick libraries return $this->Image($file, $x, $y, $w, $h, 'SVG', $link, $align, true, 300, $palign, false, false, $border, false, false, false);