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.043

Browse Source
This commit is contained in:
nicolaasuni 2011-01-14 19:42:08 +01:00
parent 73634a503c
commit 182ea007d1
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CHANGELOG.TXT
View File

@ -1,3 +1,8 @@
5.9.043 (2011-01-14)
- Bug #3158178 "PHP Notice" was fixed.
- Bug #3158193 "Endless loop in writeHTML" was fixed.
- Bug #3157764 "SVG Pie chart incorrectly rendered2".
5.9.042 (2011-01-14) 5.9.042 (2011-01-14)
- Some problems of the PHP4 version were fixed. - Some problems of the PHP4 version were fixed.

2
README.TXT
View File

@ -8,7 +8,7 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.042 Version: 5.9.043
Release date: 2011-01-14 Release date: 2011-01-14
Author: Nicola Asuni Author: Nicola Asuni

20
tcpdf.php
View File

@ -1,7 +1,7 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.042 // Version : 5.9.043
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2011-01-14 // Last Update : 2011-01-14
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
@ -134,7 +134,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.042 * @version 5.9.043
*/ */
// 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.
@ -146,7 +146,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.042 * @version 5.9.043
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -157,7 +157,7 @@ class TCPDF {
* Current TCPDF version. * Current TCPDF version.
* @private * @private
*/ */
private $tcpdf_version = '5.9.042'; private $tcpdf_version = '5.9.043';
// Protected properties // Protected properties
@ -6079,12 +6079,12 @@ class TCPDF {
$this->writeHTML($txt, true, 0, $reseth, true, $align); $this->writeHTML($txt, true, 0, $reseth, true, $align);
$nl = 1; $nl = 1;
} else { // ******* Write simple text } else { // ******* Write simple text
$prev_FontSizePt = $this->FontSizePt;
// vertical alignment // vertical alignment
if ($maxh > 0) { if ($maxh > 0) {
// get text height // get text height
$text_height = $this->getStringHeight($w, $txt, $reseth, $autopadding, $mc_padding, $border); $text_height = $this->getStringHeight($w, $txt, $reseth, $autopadding, $mc_padding, $border);
if ($fitcell) { if ($fitcell) {
$prev_FontSizePt = $this->FontSizePt;
// try to reduce font size to fit text on cell (use a quick search algorithm) // try to reduce font size to fit text on cell (use a quick search algorithm)
$fmin = 1; $fmin = 1;
$fmax = $this->FontSizePt; $fmax = $this->FontSizePt;
@ -19290,8 +19290,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$autolinebreak = false; $autolinebreak = false;
if (isset($dom[$key]['width']) AND ($dom[$key]['width'] > 0)) { if (isset($dom[$key]['width']) AND ($dom[$key]['width'] > 0)) {
$imgw = $this->getHTMLUnitToUnits($dom[$key]['width'], 1, 'px', false); $imgw = $this->getHTMLUnitToUnits($dom[$key]['width'], 1, 'px', false);
if (($this->rtl AND (($this->x - $imgw) < ($this->lMargin + $this->cell_padding['L']))) if (($imgw <= ($this->w - $this->lMargin - $this->rMargin - $this->cell_padding['L'] - $this->cell_padding['R']))
OR (!$this->rtl AND (($this->x + $imgw) > ($this->w - $this->rMargin - $this->cell_padding['R'])))) { AND (($this->rtl AND (($this->x - $imgw) < ($this->lMargin + $this->cell_padding['L'])))
OR (!$this->rtl AND (($this->x + $imgw) > ($this->w - $this->rMargin - $this->cell_padding['R']))))) {
// add automatic line break // add automatic line break
$autolinebreak = true; $autolinebreak = true;
$this->Ln('', $cell); $this->Ln('', $cell);
@ -25503,8 +25504,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$fs = $rawparams[($ck - 2)]; // sweep-flag $fs = $rawparams[($ck - 2)]; // sweep-flag
$x = $params[($ck - 1)] + $xoffset; $x = $params[($ck - 1)] + $xoffset;
$y = $params[$ck] + $yoffset; $y = $params[$ck] + $yoffset;
if (($x0 == $x) AND ($y0 == $y)) { $minlen = (0.01 / $this->k); // 3 point
// endpoints are identical if ((abs($x0 - $x) < $minlen) AND (abs($x0 - $x) < $minlen)) {
// endpoints are almost identical
break; break;
} }
$cos_ang = cos($angle); $cos_ang = cos($angle);