diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT index 12ad1b1..72fc59d 100755 --- a/CHANGELOG.TXT +++ b/CHANGELOG.TXT @@ -1,3 +1,7 @@ +5.9.077 (2011-05-07) + - Bug item #3298591 "error code93" was fixed. + - SetLineStyle() function was improved. + 5.9.076 (2011-05-06) - Bug item #3298264 "codebar 93 error" was fixed. diff --git a/README.TXT b/README.TXT index 88a0131..7afdbcb 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.076 -Release date: 2011-05-06 +Version: 5.9.077 +Release date: 2011-05-07 Author: Nicola Asuni Copyright (c) 2002-2011: diff --git a/barcodes.php b/barcodes.php index 3d6ceb9..128dbb2 100755 --- a/barcodes.php +++ b/barcodes.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf - * @version 1.0.013 + * @version 1.0.014 * @author Nicola Asuni */ class TCPDFBarcode { @@ -410,7 +410,7 @@ class TCPDFBarcode { $chr[70] = '231111'; // F $chr[71] = '112113'; // G $chr[72] = '112212'; // H - $chr[72] = '112311'; // I + $chr[73] = '112311'; // I $chr[74] = '122112'; // J $chr[75] = '132111'; // K $chr[76] = '111123'; // L diff --git a/tcpdf.php b/tcpdf.php index 97a974e..b99bc3a 100755 --- a/tcpdf.php +++ b/tcpdf.php @@ -1,9 +1,9 @@ * @package com.tecnick.tcpdf * @author Nicola Asuni - * @version 5.9.076 + * @version 5.9.077 */ // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file. @@ -146,7 +146,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.076 + * @version 5.9.077 * @author Nicola Asuni - info@tecnick.com */ class TCPDF { @@ -157,7 +157,7 @@ class TCPDF { * Current TCPDF version. * @private */ - private $tcpdf_version = '5.9.076'; + private $tcpdf_version = '5.9.077'; // Protected properties @@ -12897,33 +12897,32 @@ class TCPDF { if (!is_array($style)) { return; } - extract($style); - if (isset($width)) { - $this->LineWidth = $width; - $this->linestyleWidth = sprintf('%.2F w', ($width * $this->k)); + if (isset($style['width'])) { + $this->LineWidth = $style['width']; + $this->linestyleWidth = sprintf('%.2F w', ($style['width'] * $this->k)); $s .= $this->linestyleWidth.' '; } - if (isset($cap)) { + if (isset($style['cap'])) { $ca = array('butt' => 0, 'round'=> 1, 'square' => 2); - if (isset($ca[$cap])) { - $this->linestyleCap = $ca[$cap].' J'; + if (isset($ca[$style['cap']])) { + $this->linestyleCap = $ca[$style['cap']].' J'; $s .= $this->linestyleCap.' '; } } - if (isset($join)) { + if (isset($style['join'])) { $ja = array('miter' => 0, 'round' => 1, 'bevel' => 2); - if (isset($ja[$join])) { - $this->linestyleJoin = $ja[$join].' j'; + if (isset($ja[$style['join']])) { + $this->linestyleJoin = $ja[$style['join']].' j'; $s .= $this->linestyleJoin.' '; } } - if (isset($dash)) { + if (isset($style['dash'])) { $dash_string = ''; - if ($dash) { - if (preg_match('/^.+,/', $dash) > 0) { - $tab = explode(',', $dash); + if ($style['dash']) { + if (preg_match('/^.+,/', $style['dash']) > 0) { + $tab = explode(',', $style['dash']); } else { - $tab = array($dash); + $tab = array($style['dash']); } $dash_string = ''; foreach ($tab as $i => $v) { @@ -12933,14 +12932,14 @@ class TCPDF { $dash_string .= sprintf('%.2F', $v); } } - if (!isset($phase) OR !$dash) { - $phase = 0; + if (!isset($style['phase']) OR !$style['dash']) { + $style['phase'] = 0; } - $this->linestyleDash = sprintf('[%s] %.2F d', $dash_string, $phase); + $this->linestyleDash = sprintf('[%s] %.2F d', $dash_string, $style['phase']); $s .= $this->linestyleDash.' '; } - if (isset($color)) { - $s .= $this->SetDrawColorArray($color, true).' '; + if (isset($style['color'])) { + $s .= $this->SetDrawColorArray($style['color'], true).' '; } if (!$ret) { $this->_out($s);