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.
This commit is contained in:
nicolaasuni 2014-07-09 19:21:01 +01:00
parent e750c674f6
commit 196ef5e4f7
5 changed files with 24 additions and 15 deletions

View File

@ -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) 6.0.087 (2014-06-25)
- A bug affecting fitcell option in Multicell was fixed. - A bug affecting fitcell option in Multicell was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 6.0.087 Version: 6.0.088
Release date: 2014-06-25 Release date: 2014-07-09
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2014: Copyright (c) 2002-2014:

View File

@ -1,6 +1,6 @@
{ {
"name": "tecnick.com/tcpdf", "name": "tecnick.com/tcpdf",
"version": "6.0.087", "version": "6.0.088",
"homepage": "http://www.tcpdf.org/", "homepage": "http://www.tcpdf.org/",
"type": "library", "type": "library",
"description": "TCPDF is a PHP class for generating PDF documents.", "description": "TCPDF is a PHP class for generating PDF documents.",

View File

@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version. * Current TCPDF version.
* @private static * @private static
*/ */
private static $tcpdf_version = '6.0.087'; private static $tcpdf_version = '6.0.088';
/** /**
* String alias for total number of pages. * String alias for total number of pages.

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 6.0.087 // Version : 6.0.088
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2014-06-19 // Last Update : 2014-07-09
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -104,7 +104,7 @@
* Tools to encode your unicode fonts are on fonts/utils directory.</p> * Tools to encode your unicode fonts are on fonts/utils directory.</p>
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @author Nicola Asuni * @author Nicola Asuni
* @version 6.0.087 * @version 6.0.088
*/ */
// TCPDF configuration // 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.<br> * 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.<br>
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions. * @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 * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -1291,14 +1291,14 @@ class TCPDF {
/** /**
* Boolean flag to enable document timestamping with TSA. * Boolean flag to enable document timestamping with TSA.
* @protected * @protected
* @since 6.0.087 (2014-06-19) * @since 6.0.088 (2014-06-19)
*/ */
protected $tsa_timestamp = false; protected $tsa_timestamp = false;
/** /**
* Timestamping data. * Timestamping data.
* @protected * @protected
* @since 6.0.087 (2014-06-19) * @since 6.0.088 (2014-06-19)
*/ */
protected $tsa_data = array(); protected $tsa_data = array();
@ -7088,9 +7088,14 @@ class TCPDF {
try { try {
// ImageMagick library // ImageMagick library
$img = new Imagick(); $img = new Imagick();
if ($type == 'SVG') { if ($type == 'svg') {
// get SVG file content if ($file[0] === '@') {
$svgimg = TCPDF_STATIC::fileGetContents($file); // image from string
$svgimg = substr($file, 1);
} else {
// get SVG file content
$svgimg = TCPDF_STATIC::fileGetContents($file);
}
if ($svgimg !== FALSE) { if ($svgimg !== FALSE) {
// get width and height // get width and height
$regs = array(); $regs = array();
@ -13626,7 +13631,7 @@ class TCPDF {
* @param $tsa_cert (string) Specifies the location of TSA certificate for authorization (optional for cURL) * @param $tsa_cert (string) Specifies the location of TSA certificate for authorization (optional for cURL)
* @public * @public
* @author Richard Stockinger * @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='') { public function setTimeStamp($tsa_host='', $tsa_username='', $tsa_password='', $tsa_cert='') {
$this->tsa_data = array(); $this->tsa_data = array();
@ -13654,7 +13659,7 @@ class TCPDF {
* @return (string) Timestamped digital signature * @return (string) Timestamped digital signature
* @protected * @protected
* @author Richard Stockinger * @author Richard Stockinger
* @since 6.0.087 (2014-06-16) * @since 6.0.088 (2014-06-16)
*/ */
protected function applyTSA($signature) { protected function applyTSA($signature) {
if (!$this->tsa_timestamp) { if (!$this->tsa_timestamp) {