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

6.0.041 (2013-10-21)

Browse Source 
- Bug #851 "Problem with images in PDF. PHP timing out" was fixed.
This commit is contained in:
nicolaasuni 2013-10-21 20:11:25 +01:00
parent 452f84276a
commit e06a71678b
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.TXT
View File

@ -1,6 +1,8 @@
6.0.041 (2013-10-21)
- Bug #851 "Problem with images in PDF. PHP timing out" was fixed.
6.0.040 (2013-10-20)
- Bug #849 "SVG import bug" was fixed.
- Bug #851 "Problem with images in PDF. PHP timing out" was fixed.
6.0.039 (2013-10-13)
- Bug #843 "Wrong call in parser" was fixed.

4
README.TXT
View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
Version: 6.0.040
Release date: 2013-10-20
Version: 6.0.041
Release date: 2013-10-21
Author: Nicola Asuni
Copyright (c) 2002-2013:

2
composer.json
View File

@ -1,6 +1,6 @@
{
"name": "tecnick.com/tcpdf",
"version": "6.0.040",
"version": "6.0.041",
"homepage": "http://www.tcpdf.org/",
"type": "library",
"description": "TCPDF is a PHP class for generating PDF documents.",

2
include/tcpdf_static.php
View File

@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version.
* @private static
*/
private static $tcpdf_version = '6.0.040';
private static $tcpdf_version = '6.0.041';
/**
* String alias for total number of pages.

19
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php
//============================================================+
// File name : tcpdf.php
// Version : 6.0.040
// Version : 6.0.041
// Begin : 2002-08-03
// Last Update : 2013-10-20
// Last Update : 2013-10-21
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// -------------------------------------------------------------------
@ -104,7 +104,7 @@
* Tools to encode your unicode fonts are on fonts/utils directory.</p>
* @package com.tecnick.tcpdf
* @author Nicola Asuni
* @version 6.0.040
* @version 6.0.041
*/
// TCPDF configuration
@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.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>
* @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions.
* @version 6.0.040
* @version 6.0.041
* @author Nicola Asuni - info@tecnick.com
*/
class TCPDF {
@ -6801,10 +6801,10 @@ class TCPDF {
$imgdata = TCPDF_STATIC::fileGetContents($file);
}
}
if (isset($imgdata) AND ($imgdata !== FALSE)) {
if (isset($imgdata) AND ($imgdata !== FALSE) AND (strpos($file, '__tcpdf_img') === FALSE)) {
// copy image to cache
$original_file = $file;
$file = TCPDF_STATIC::getObjFilename('img');
$file = TCPDF_STATIC::getObjFilename('img'); //DEBUG
$fp = fopen($file, 'w');
fwrite($fp, $imgdata);
fclose($fp);
@ -6925,12 +6925,12 @@ class TCPDF {
$newimage = true;
}
}
} elseif (($ismask === false) AND ($imgmask === false)) {
// check for cached images with alpha channel
} elseif (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_imgmask_') === FALSE)) {
// create temp image file (without alpha channel)
$tempfile_plain = K_PATH_CACHE.'__tcpdf_imgmask_plain_'.$filehash;
// create temp alpha file
$tempfile_alpha = K_PATH_CACHE.'__tcpdf_imgmask_alpha_'.$filehash;
// check for cached images
if (in_array($tempfile_plain, $this->imagekeys)) {
// get existing image data
$info = $this->getImageBuffer($tempfile_plain);
@ -6965,7 +6965,8 @@ class TCPDF {
if ((method_exists('TCPDF_IMAGES', $mtd)) AND (!($resize AND (function_exists($gdfunction) OR extension_loaded('imagick'))))) {
// TCPDF image functions
$info = TCPDF_IMAGES::$mtd($file);
if (($info === 'pngalpha') OR (isset($info['trns']) AND !empty($info['trns']))) {
if (($ismask === false) AND ($imgmask === false) AND (strpos($file, '__tcpdf_imgmask_') === FALSE)
AND (($info === 'pngalpha') OR (isset($info['trns']) AND !empty($info['trns'])))) {
return $this->ImagePngAlpha($file, $x, $y, $pixw, $pixh, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign, $filehash);
}
}