joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-22 12:55:10 +00:00
Code Issues Releases Activity

5.9.162 (2012-05-11)

Browse Source 
- A bug related to long text on TD cells was fixed.
This commit is contained in:
nicolaasuni 2012-05-11 18:59:03 +01:00
parent 814ff2e01f
commit dc7dfc0ed9
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.TXT
View File

@ -1,3 +1,6 @@
5.9.162 (2012-05-11)
- A bug related to long text on TD cells was fixed.
5.9.161 (2012-05-09) 5.9.161 (2012-05-09)
- A bug on XREF table was fixed (Bug ID: 3525051). - A bug on XREF table was fixed (Bug ID: 3525051).
- Deprecated Imagick:clone was replaced. - Deprecated Imagick:clone was replaced.

4
README.TXT
View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.161 Version: 5.9.162
Release date: 2012-05-09 Release date: 2012-05-11
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2012: Copyright (c) 2002-2012:

21
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.161 // Version : 5.9.162
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2012-05-09 // Last Update : 2012-05-11
// Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 // License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -137,7 +137,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 5.9.161 * @version 5.9.162
*/ */
// Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
@ -149,7 +149,7 @@ require_once(dirname(__FILE__).'/config/tcpdf_config.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 5.9.161 * @version 5.9.162
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -160,7 +160,7 @@ class TCPDF {
* Current TCPDF version. * Current TCPDF version.
* @private * @private
*/ */
private $tcpdf_version = '5.9.161'; private $tcpdf_version = '5.9.162';
// Protected properties // Protected properties
@ -7075,7 +7075,7 @@ class TCPDF {
$w = $this->w - $this->rMargin - $this->x; $w = $this->w - $this->rMargin - $this->x;
} }
// max column width // max column width
$wmax = $w - $wadj; $wmax = ($w - $wadj);
if (!$firstline) { if (!$firstline) {
$wmax -= ($this->cell_padding['L'] + $this->cell_padding['R']); $wmax -= ($this->cell_padding['L'] + $this->cell_padding['R']);
} }
@ -7161,7 +7161,7 @@ class TCPDF {
$this->rMargin += $margin['R']; $this->rMargin += $margin['R'];
} }
$w = $this->getRemainingWidth(); $w = $this->getRemainingWidth();
$wmax = $w - $this->cell_padding['L'] - $this->cell_padding['R']; $wmax = ($w - $this->cell_padding['L'] - $this->cell_padding['R']);
} else { } else {
// 160 is the non-breaking space. // 160 is the non-breaking space.
// 173 is SHY (Soft Hypen). // 173 is SHY (Soft Hypen).
@ -7197,8 +7197,8 @@ class TCPDF {
// we have reached the end of column // we have reached the end of column
if ($sep == -1) { if ($sep == -1) {
// check if the line was already started // check if the line was already started
if (($this->rtl AND ($this->x <= ($this->w - $this->rMargin - $chrwidth))) if (($this->rtl AND ($this->x <= ($this->w - $this->rMargin - $this->cell_padding['R'] - $margin['R'] - $chrwidth)))
OR ((!$this->rtl) AND ($this->x >= ($this->lMargin + $chrwidth)))) { OR ((!$this->rtl) AND ($this->x >= ($this->lMargin + $this->cell_padding['L'] + $margin['L'] + $chrwidth)))) {
// print a void cell and go to next line // print a void cell and go to next line
$this->Cell($w, $h, '', 0, 1); $this->Cell($w, $h, '', 0, 1);
$linebreak = true; $linebreak = true;
@ -26468,8 +26468,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
* @since 4.5.029 (2009-03-19) * @since 4.5.029 (2009-03-19)
*/ */
public function objclone($object) { public function objclone($object) {
// clone is defined only in PHP 5 return @clone($object);
return (version_compare(phpversion(), '5.0') < 0) ? $object : clone($object);
} }
/** /**