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

6.2.9 (2015-06-18)

Browse Source 
-
This commit is contained in:
nicolaasuni 2015-06-18 10:12:38 +01:00
parent 3dee9e7f3a
commit fa6ab8a1e1
6 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.TXT
View File

@ -1,3 +1,6 @@
6.2.9 (2015-06-18)
-
6.2.8 (2015-04-29) 6.2.8 (2015-04-29)
- Removed unwanted file. - Removed unwanted file.

4
README.TXT
View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 6.2.8 Version: 6.2.9
Release date: 2015-04-29 Release date: 2015-06-18
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2015: Copyright (c) 2002-2015:

2
composer.json
View File

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

8
include/tcpdf_images.php
View File

@ -160,6 +160,14 @@ class TCPDF_IMAGES {
* @public static * @public static
*/ */
public static function _parsejpeg($file) { public static function _parsejpeg($file) {
// check if is a local file
if (!@file_exists($file)) {
// try to encode spaces on filename
$tfile = str_replace(' ', '%20', $file);
if (@file_exists($tfile)) {
$file = $tfile;
}
}
$a = getimagesize($file); $a = getimagesize($file);
if (empty($a)) { if (empty($a)) {
//Missing or incorrect image file //Missing or incorrect image file

2
include/tcpdf_static.php
View File

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

9
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 6.2.8 // Version : 6.2.9
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2015-04-29 // Last Update : 2015-06-18
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html) // License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -7026,6 +7026,7 @@ class TCPDF {
AND (($info === 'pngalpha') OR (isset($info['trns']) AND !empty($info['trns'])))) { 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); return $this->ImagePngAlpha($file, $x, $y, $pixw, $pixh, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign, $filehash);
} }
$info = false;
} }
if (($info === false) AND function_exists($gdfunction)) { if (($info === false) AND function_exists($gdfunction)) {
try { try {
@ -10362,7 +10363,7 @@ class TCPDF {
* @public * @public
*/ */
public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) { public function addHtmlLink($url, $name, $fill=false, $firstline=false, $color='', $style=-1, $firstblock=false) {
if (isset($url[1]) AND ($url[0] == '#')) { if (isset($url[1]) AND ($url[0] == '#') AND is_numeric($url[1])) {
// convert url to internal link // convert url to internal link
$lnkdata = explode(',', $url); $lnkdata = explode(',', $url);
if (isset($lnkdata[0]) ) { if (isset($lnkdata[0]) ) {
@ -18649,7 +18650,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$this->lispacer = $prev_lispacer; $this->lispacer = $prev_lispacer;
if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) { if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) {
$this->Ln($this->lasth); $this->Ln($this->lasth);
if ($this->y < $maxbottomliney) { if (($this->y < $maxbottomliney) AND ($startlinepage == $this->page)) {
$this->y = $maxbottomliney; $this->y = $maxbottomliney;
} }
} }