mirror of https://github.com/vdm-io/tcpdf.git
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
parent
e750c674f6
commit
196ef5e4f7
|
|
@ -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.
|
||||
|
||||
|
|
|
|||
|
|
@ -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:
|
||||
|
|
|
|||
|
|
@ -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.",
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
27
tcpdf.php
27
tcpdf.php
|
|
@ -1,9 +1,9 @@
|
|||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Version : 6.0.087
|
||||
// Version : 6.0.088
|
||||
// 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
|
||||
// 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>
|
||||
* @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.<br>
|
||||
* @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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue