diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index b44794a..bf85447 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +6.0.088 (2014-07-09) + - Bug item #946 "Case sensitive type check causes broken match for SVG" was fixed. + - Bug item #945 "Imagick load doesn't account for passed data string " was fixed. + 6.0.087 (2014-06-25) - A bug affecting fitcell option in Multicell was fixed. diff --git a/README.TXT b/README.TXT index a039957..42c76a2 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.087 -Release date: 2014-06-25 +Version: 6.0.088 +Release date: 2014-07-09 Author: Nicola Asuni Copyright (c) 2002-2014: diff --git a/composer.json b/composer.json index cef2fc5..d9b24d5 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.0.087", + "version": "6.0.088", "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 1222b25..a36bbc8 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.087'; + private static $tcpdf_version = '6.0.088'; /** * String alias for total number of pages. diff --git a/tcpdf.php b/tcpdf.php index fc05a7e..1ab95ac 100644 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 6.0.087 + * @version 6.0.088 */ // 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.087 + * @version 6.0.088 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -1291,14 +1291,14 @@ class TCPDF { /** * Boolean flag to enable document timestamping with TSA. * @protected - * @since 6.0.087 (2014-06-19) + * @since 6.0.088 (2014-06-19) */ protected $tsa_timestamp = false; /** * Timestamping data. * @protected - * @since 6.0.087 (2014-06-19) + * @since 6.0.088 (2014-06-19) */ protected $tsa_data = array(); @@ -7088,9 +7088,14 @@ class TCPDF { try { // ImageMagick library $img = new Imagick(); - if ($type == 'SVG') { - // get SVG file content - $svgimg = TCPDF_STATIC::fileGetContents($file); + if ($type == 'svg') { + if ($file[0] === '@') { + // image from string + $svgimg = substr($file, 1); + } else { + // get SVG file content + $svgimg = TCPDF_STATIC::fileGetContents($file); + } if ($svgimg !== FALSE) { // get width and height $regs = array(); @@ -13626,7 +13631,7 @@ class TCPDF { * @param $tsa_cert (string) Specifies the location of TSA certificate for authorization (optional for cURL) * @public * @author Richard Stockinger - * @since 6.0.087 (2014-06-16) + * @since 6.0.088 (2014-06-16) */ public function setTimeStamp($tsa_host='', $tsa_username='', $tsa_password='', $tsa_cert='') { $this->tsa_data = array(); @@ -13654,7 +13659,7 @@ class TCPDF { * @return (string) Timestamped digital signature * @protected * @author Richard Stockinger - * @since 6.0.087 (2014-06-16) + * @since 6.0.088 (2014-06-16) */ protected function applyTSA($signature) { if (!$this->tsa_timestamp) {