diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 8278d3b..c893bc1 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,6 @@ +5.9.141 (2011-12-14) + - Some minor bugs were fixed. + 5.9.140 (2011-12-13) - SVG now supports embedded images encoded as base64. diff --git a/README.TXT b/README.TXT index 611ee08..3e9acc3 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.140 -Release date: 2011-12-13 +Version: 5.9.141 +Release date: 2011-12-14 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/tcpdf.php b/tcpdf.php index 2317805..17a9a20 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.140 + * @version 5.9.141 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -150,7 +150,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.140 + * @version 5.9.141 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -161,7 +161,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.140'; + private $tcpdf_version = '5.9.141'; // Protected properties @@ -4592,7 +4592,9 @@ class TCPDF { $k = isset($color[3]) ? $color[3] : -1; // color name $name = isset($color[4]) ? $color[4] : ''; - return $this->setColor($type, $c, $m, $y, $k, $ret, $name); + if ($c >= 0) { + return $this->setColor($type, $c, $m, $y, $k, $ret, $name); + } } return ''; } @@ -4737,6 +4739,7 @@ class TCPDF { * @since 5.9.137 (2011-12-01) */ protected function getColorStringFromArray($c) { + $c = array_values($c); $color = '['; switch (count($c)) { case 4: {