From 4bc961234b61c77789b1dfb03738b2da772f1a60 Mon Sep 17 00:00:00 2001 From: nicolaasuni Date: Thu, 24 Feb 2011 16:42:56 +0100 Subject: [PATCH] 5.9.057 --- CHANGELOG.TXT | 3 +++ README.TXT | 4 ++-- examples/example_033.php | 3 +++ tcpdf.php | 24 +++++++++++++----------- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 66350bc..86c3ab9 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -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) - A bug on fixHTMLCode() method was fixed. - Automatic line break for HTML was fixed. diff --git a/README.TXT b/README.TXT index f200a73..3b45472 100755 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 5.9.056 -Release date: 2011-02-22 +Version: 5.9.057 +Release date: 2011-02-24 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/examples/example_033.php b/examples/example_033.php index 17ea52b..d9de0cd 100755 --- a/examples/example_033.php +++ b/examples/example_033.php @@ -69,6 +69,9 @@ $pdf->setLanguageArray($l); // add a page $pdf->AddPage(); +// set default font subsetting mode +$pdf->setFontSubsetting(false); + $pdf->SetFont('helvetica', 'B', 20); $pdf->Write(0, 'Font Types', '', 0, 'C', 1, 0, false, false, 0); diff --git a/tcpdf.php b/tcpdf.php index 267be00..bb66143 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @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. @@ -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.
* @package com.tecnick.tcpdf * @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 */ class TCPDF { @@ -157,7 +157,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.056'; + private $tcpdf_version = '5.9.057'; // Protected properties @@ -7183,7 +7183,7 @@ class TCPDF { // check if we are passing an image as file or string if ($file{0} === '@') { // image from string $imgdata = substr($file, 1); - $file = tempnam(K_PATH_CACHE, 'img_'); + $file = K_PATH_CACHE.'img_'.md5($imgdata); $fp = fopen($file, 'w'); fwrite($fp, $imgdata); fclose($fp); @@ -7214,9 +7214,9 @@ class TCPDF { curl_setopt($cs, CURLOPT_TIMEOUT, 30); $imgdata = curl_exec($cs); curl_close($cs); - if($imgdata !== FALSE) { + if ($imgdata !== FALSE) { // copy image to cache - $file = tempnam(K_PATH_CACHE, 'img_'); + $file = K_PATH_CACHE.'img_'.md5($imgdata); $fp = fopen($file, 'w'); fwrite($fp, $imgdata); fclose($fp); @@ -7800,9 +7800,9 @@ class TCPDF { */ protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign) { // 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 - $tempfile_alpha = tempnam(K_PATH_CACHE, 'mska_'); + $tempfile_alpha = K_PATH_CACHE.'mska_'.md5($file); if (extension_loaded('imagick')) { // ImageMagick // ImageMagick library $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'])]; } // for each row - unset($xmax); + if (count($table_el['trids']) > 0) { + unset($xmax); + } foreach ($table_el['trids'] as $j => $trkey) { $parent = $dom[$trkey]; if (!isset($xmax)) {