mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-10-31 18:52:35 +00:00
6.0.089 (2014-07-16)
- Bug item #948 "bottom line of rowspan cell not work correctly" was fixed.
This commit is contained in:
parent
196ef5e4f7
commit
979432f754
@ -1,3 +1,6 @@
|
|||||||
|
6.0.089 (2014-07-16)
|
||||||
|
- Bug item #948 "bottom line of rowspan cell not work correctly" was fixed.
|
||||||
|
|
||||||
6.0.088 (2014-07-09)
|
6.0.088 (2014-07-09)
|
||||||
- Bug item #946 "Case sensitive type check causes broken match for SVG" was fixed.
|
- 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.
|
- Bug item #945 "Imagick load doesn't account for passed data string " was fixed.
|
||||||
|
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
|||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
|
|
||||||
Name: TCPDF
|
Name: TCPDF
|
||||||
Version: 6.0.088
|
Version: 6.0.089
|
||||||
Release date: 2014-07-09
|
Release date: 2014-07-16
|
||||||
Author: Nicola Asuni
|
Author: Nicola Asuni
|
||||||
|
|
||||||
Copyright (c) 2002-2014:
|
Copyright (c) 2002-2014:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tecnick.com/tcpdf",
|
"name": "tecnick.com/tcpdf",
|
||||||
"version": "6.0.088",
|
"version": "6.0.089",
|
||||||
"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.",
|
||||||
|
@ -55,7 +55,7 @@ class TCPDF_STATIC {
|
|||||||
* Current TCPDF version.
|
* Current TCPDF version.
|
||||||
* @private static
|
* @private static
|
||||||
*/
|
*/
|
||||||
private static $tcpdf_version = '6.0.088';
|
private static $tcpdf_version = '6.0.089';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String alias for total number of pages.
|
* String alias for total number of pages.
|
||||||
|
18
tcpdf.php
18
tcpdf.php
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
//============================================================+
|
//============================================================+
|
||||||
// File name : tcpdf.php
|
// File name : tcpdf.php
|
||||||
// Version : 6.0.088
|
// Version : 6.0.089
|
||||||
// Begin : 2002-08-03
|
// Begin : 2002-08-03
|
||||||
// Last Update : 2014-07-09
|
// Last Update : 2014-07-16
|
||||||
// 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.088
|
* @version 6.0.089
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// 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.088
|
* @version 6.0.089
|
||||||
* @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.088 (2014-06-19)
|
* @since 6.0.089 (2014-06-19)
|
||||||
*/
|
*/
|
||||||
protected $tsa_timestamp = false;
|
protected $tsa_timestamp = false;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Timestamping data.
|
* Timestamping data.
|
||||||
* @protected
|
* @protected
|
||||||
* @since 6.0.088 (2014-06-19)
|
* @since 6.0.089 (2014-06-19)
|
||||||
*/
|
*/
|
||||||
protected $tsa_data = array();
|
protected $tsa_data = array();
|
||||||
|
|
||||||
@ -13631,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.088 (2014-06-16)
|
* @since 6.0.089 (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();
|
||||||
@ -13659,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.088 (2014-06-16)
|
* @since 6.0.089 (2014-06-16)
|
||||||
*/
|
*/
|
||||||
protected function applyTSA($signature) {
|
protected function applyTSA($signature) {
|
||||||
if (!$this->tsa_timestamp) {
|
if (!$this->tsa_timestamp) {
|
||||||
@ -19580,7 +19580,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
|||||||
// update row-spanned cells
|
// update row-spanned cells
|
||||||
if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
|
if (isset($dom[($dom[$key]['parent'])]['rowspans'])) {
|
||||||
foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
|
foreach ($dom[($dom[$key]['parent'])]['rowspans'] as $k => $trwsp) {
|
||||||
if (($trwsp['trid'] == $trkey) AND ($trwsp['mrowspan'] > 1) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
|
if (($trwsp['trid'] == $prevtrkey) AND ($trwsp['mrowspan'] >= 0) AND ($trwsp['endpage'] == $dom[$prevtrkey]['endpage'])) {
|
||||||
$dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
|
$dom[($dom[$key]['parent'])]['rowspans'][$k]['endy'] = $pgendy;
|
||||||
$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
|
$dom[($dom[$key]['parent'])]['rowspans'][$k]['mrowspan'] = -1;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user