diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 8776ad9..5277d01 100644 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +6.2.9 (2015-06-18) + - + 6.2.8 (2015-04-29) - Removed unwanted file. diff --git a/README.TXT b/README.TXT index c51d9c0..b3a4a8b 100644 --- a/README.TXT +++ b/README.TXT @@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076 ------------------------------------------------------------ Name: TCPDF -Version: 6.2.8 -Release date: 2015-04-29 +Version: 6.2.9 +Release date: 2015-06-18 Author: Nicola Asuni Copyright (c) 2002-2015: diff --git a/composer.json b/composer.json index 736f2ba..72fbdc8 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "tecnick.com/tcpdf", - "version": "6.2.8", + "version": "6.2.9", "homepage": "http://www.tcpdf.org/", "type": "library", "description": "TCPDF is a PHP class for generating PDF documents and barcodes.", diff --git a/include/tcpdf_images.php b/include/tcpdf_images.php index c7ae9bd..40cbe9d 100644 --- a/include/tcpdf_images.php +++ b/include/tcpdf_images.php @@ -160,6 +160,14 @@ class TCPDF_IMAGES { * @public static */ 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); if (empty($a)) { //Missing or incorrect image file diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php index c68d095..4ab18b6 100644 --- a/include/tcpdf_static.php +++ b/include/tcpdf_static.php @@ -55,7 +55,7 @@ class TCPDF_STATIC { * Current TCPDF version. * @private static */ - private static $tcpdf_version = '6.2.8'; + private static $tcpdf_version = '6.2.9'; /** * String alias for total number of pages. diff --git a/tcpdf.php b/tcpdf.php index 32458da..1412834 100644 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ ImagePngAlpha($file, $x, $y, $pixw, $pixh, $w, $h, 'PNG', $link, $align, $resize, $dpi, $palign, $filehash); } + $info = false; } if (($info === false) AND function_exists($gdfunction)) { try { @@ -10362,7 +10363,7 @@ class TCPDF { * @public */ 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 $lnkdata = explode(',', $url); 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; if ($ln AND (!($cell AND ($dom[$key-1]['value'] == 'table')))) { $this->Ln($this->lasth); - if ($this->y < $maxbottomliney) { + if (($this->y < $maxbottomliney) AND ($startlinepage == $this->page)) { $this->y = $maxbottomliney; } }