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

update

Browse Source
This commit is contained in:
nick 2012-06-27 11:08:15 +01:00
parent 14e93b77c5
commit 68a349a698
3 changed files with 14 additions and 11 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.170 (2012-06-27)
- Bug #3538227 "Numerous errors inserting shared images" was fixed.
5.9.169 (2012-06-25) 5.9.169 (2012-06-25)
- Some SVG rendering problems were fixed. - Some SVG rendering problems were fixed.

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.169 Version: 5.9.170
Release date: 2012-06-25 Release date: 2012-06-27
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2012: Copyright (c) 2002-2012:

18
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 5.9.169 // Version : 5.9.170
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2012-06-25 // Last Update : 2012-06-27
// 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.169 * @version 5.9.170
*/ */
// 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.169 * @version 5.9.170
* @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.169'; private $tcpdf_version = '5.9.170';
// Protected properties // Protected properties
@ -7758,7 +7758,7 @@ class TCPDF {
if ($file[0] === '@') { if ($file[0] === '@') {
// image from string // image from string
$imgdata = substr($file, 1); $imgdata = substr($file, 1);
$file = K_PATH_CACHE.'img_'.md5($imgdata); $file = $this->getObjFilename('img');
$fp = fopen($file, 'w'); $fp = fopen($file, 'w');
fwrite($fp, $imgdata); fwrite($fp, $imgdata);
fclose($fp); fclose($fp);
@ -7804,7 +7804,7 @@ class TCPDF {
curl_close($cs); curl_close($cs);
if ($imgdata !== FALSE) { if ($imgdata !== FALSE) {
// copy image to cache // copy image to cache
$file = K_PATH_CACHE.'img_'.md5($imgdata); $file = $this->getObjFilename('img');
$fp = fopen($file, 'w'); $fp = fopen($file, 'w');
fwrite($fp, $imgdata); fwrite($fp, $imgdata);
fclose($fp); fclose($fp);
@ -7835,7 +7835,7 @@ class TCPDF {
} }
} }
// file hash // file hash
$filehash = md5($file); $filehash = md5($this->file_id.$file);
// get original image width and height in pixels // get original image width and height in pixels
list($pixw, $pixh) = $imsize; list($pixw, $pixh) = $imsize;
// calculate image width and height on document // calculate image width and height on document
@ -8493,7 +8493,7 @@ class TCPDF {
*/ */
protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $filehash='') { protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $filehash='') {
if (empty($filehash)) { if (empty($filehash)) {
$filehash = md5($file); $filehash = md5($this->file_id.$file);
} }
// create temp image file (without alpha channel) // create temp image file (without alpha channel)
$tempfile_plain = K_PATH_CACHE.'mskp_'.$filehash; $tempfile_plain = K_PATH_CACHE.'mskp_'.$filehash;