32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-25 22:07:33 +00:00
This commit is contained in:
nicolaasuni 2011-02-24 16:42:56 +01:00
parent 279df4ca9f
commit 4bc961234b
4 changed files with 21 additions and 13 deletions

View File

@ -1,3 +1,6 @@
5.9.057 (2011-02-24)
- A problem with image caching system was fixed (thanks to Korneliusz Jarzębski for reporting this problem).
5.9.056 (2011-02-22) 5.9.056 (2011-02-22)
- A bug on fixHTMLCode() method was fixed. - A bug on fixHTMLCode() method was fixed.
- Automatic line break for HTML was fixed. - Automatic line break for HTML was fixed.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 5.9.056 Version: 5.9.057
Release date: 2011-02-22 Release date: 2011-02-24
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2011: Copyright (c) 2002-2011:

View File

@ -69,6 +69,9 @@ $pdf->setLanguageArray($l);
// add a page // add a page
$pdf->AddPage(); $pdf->AddPage();
// set default font subsetting mode
$pdf->setFontSubsetting(false);
$pdf->SetFont('helvetica', 'B', 20); $pdf->SetFont('helvetica', 'B', 20);
$pdf->Write(0, 'Font Types', '', 0, 'C', 1, 0, false, false, 0); $pdf->Write(0, 'Font Types', '', 0, 'C', 1, 0, false, false, 0);

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.056 // Version : 5.9.057
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2011-02-22 // Last Update : 2011-02-24
// 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
// License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS. // License : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS.
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -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.056 * @version 5.9.057
*/ */
// 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.056 * @version 5.9.057
* @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.056'; private $tcpdf_version = '5.9.057';
// Protected properties // Protected properties
@ -7183,7 +7183,7 @@ class TCPDF {
// check if we are passing an image as file or string // check if we are passing an image as file or string
if ($file{0} === '@') { // image from string if ($file{0} === '@') { // image from string
$imgdata = substr($file, 1); $imgdata = substr($file, 1);
$file = tempnam(K_PATH_CACHE, 'img_'); $file = K_PATH_CACHE.'img_'.md5($imgdata);
$fp = fopen($file, 'w'); $fp = fopen($file, 'w');
fwrite($fp, $imgdata); fwrite($fp, $imgdata);
fclose($fp); fclose($fp);
@ -7214,9 +7214,9 @@ class TCPDF {
curl_setopt($cs, CURLOPT_TIMEOUT, 30); curl_setopt($cs, CURLOPT_TIMEOUT, 30);
$imgdata = curl_exec($cs); $imgdata = curl_exec($cs);
curl_close($cs); curl_close($cs);
if($imgdata !== FALSE) { if ($imgdata !== FALSE) {
// copy image to cache // copy image to cache
$file = tempnam(K_PATH_CACHE, 'img_'); $file = K_PATH_CACHE.'img_'.md5($imgdata);
$fp = fopen($file, 'w'); $fp = fopen($file, 'w');
fwrite($fp, $imgdata); fwrite($fp, $imgdata);
fclose($fp); fclose($fp);
@ -7800,9 +7800,9 @@ class TCPDF {
*/ */
protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign) { protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign) {
// create temp image file (without alpha channel) // create temp image file (without alpha channel)
$tempfile_plain = tempnam(K_PATH_CACHE, 'mskp_'); $tempfile_plain = K_PATH_CACHE.'mskp_'.md5($file);
// create temp alpha file // create temp alpha file
$tempfile_alpha = tempnam(K_PATH_CACHE, 'mska_'); $tempfile_alpha = K_PATH_CACHE.'mska_'.md5($file);
if (extension_loaded('imagick')) { // ImageMagick if (extension_loaded('imagick')) { // ImageMagick
// ImageMagick library // ImageMagick library
$img = new Imagick(); $img = new Imagick();
@ -21412,7 +21412,9 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$table_el = $dom[($dom[$key]['parent'])]; $table_el = $dom[($dom[$key]['parent'])];
} }
// for each row // for each row
unset($xmax); if (count($table_el['trids']) > 0) {
unset($xmax);
}
foreach ($table_el['trids'] as $j => $trkey) { foreach ($table_el['trids'] as $j => $trkey) {
$parent = $dom[$trkey]; $parent = $dom[$trkey];
if (!isset($xmax)) { if (!isset($xmax)) {