Commit 1fb2d8c5 authored by tecnickcom's avatar tecnickcom
Browse files

12.1.021 (2014-04-27)

- Deprecated curly braces substring syntax was replaced with square braces.
- TCPDF library was updated.
parent b0d55308
6.0.077 (2014-05-06)
- A Datamatrix barcode bug was fixed.
6.0.076 (2014-05-06)
- A bug in Datamatrix Base256 encoding was fixed.
- Merged fix for SVG use/clip-gradient.
......
......@@ -8,7 +8,7 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
Version: 6.0.076
Version: 6.0.077
Release date: 2014-05-06
Author: Nicola Asuni
......
<?php
//============================================================+
// File name : datamatrix.php
// Version : 1.0.007
// Version : 1.0.008
// Begin : 2010-06-07
// Last Update : 2014-05-06
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
......@@ -40,7 +40,7 @@
*
* @package com.tecnick.tcpdf
* @author Nicola Asuni
* @version 1.0.007
* @version 1.0.008
*/
// custom definitions
......@@ -277,9 +277,6 @@ class Datamatrix {
}
}
}
echo implode(' ', $cw)."\n";// DEBUG
// add error correction codewords
$cw = $this->getErrorCorrection($cw, $params[13], $params[14], $params[15]);
// initialize empty arrays
......@@ -835,6 +832,8 @@ class Datamatrix {
$cw[] = ($chr + 1);
++$cw_num;
$pos = $epos;
$enc = ENC_ASCII;
$this->last_enc = $enc;
} elseif (($cwr == 2) AND ($p == 1)) {
// c. If two symbol characters remain and only one C40 value (data character) remains to be encoded
$c1 = array_shift($temp_cw);
......@@ -843,6 +842,8 @@ class Datamatrix {
$cw[] = ($chr + 1);
$cw_num += 2;
$pos = $epos;
$enc = ENC_ASCII;
$this->last_enc = $enc;
} elseif (($cwr == 2) AND ($p == 2)) {
// b. If two symbol characters remain and two C40 values remain to be encoded
$c1 = array_shift($temp_cw);
......@@ -853,10 +854,13 @@ class Datamatrix {
$cw[] = ($tmp % 256);
$cw_num += 2;
$pos = $epos;
$enc = ENC_ASCII;
$this->last_enc = $enc;
} else {
// switch to ASCII encoding
if ($enc != ENC_ASCII) {
$enc = ENC_ASCII;
$this->last_enc = $enc;
$cw[] = $this->getSwitchEncodingCodeword($enc);
++$cw_num;
$pos = ($epos - $p);
......
......@@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version.
* @private static
*/
private static $tcpdf_version = '6.0.076';
private static $tcpdf_version = '6.0.077';
/**
* String alias for total number of pages.
......
<?php
//============================================================+
// File name : tcpdf.php
// Version : 6.0.076
// Version : 6.0.077
// Begin : 2002-08-03
// Last Update : 2014-05-06
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
......@@ -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.076
* @version 6.0.077
*/
 
// 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.076
* @version 6.0.077
* @author Nicola Asuni - info@tecnick.com
*/
class TCPDF {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment