From 872cb6ab57efc3d6029ff397ffb5f0573d46fd74 Mon Sep 17 00:00:00 2001
From: nicolaasuni <info@tecnick.com>
Date: Thu, 24 Apr 2014 18:48:12 +0100
Subject: [PATCH] 6.0.069 (2014-04-24) - Datamatrix Base256 encoding was fixed.

---
 CHANGELOG.TXT                   |  3 +++
 README.TXT                      |  4 ++--
 composer.json                   |  2 +-
 include/barcodes/datamatrix.php | 14 +++++++-------
 tcpdf.php                       |  8 ++++----
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 56b791c..13bc52f 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+6.0.069 (2014-04-24)
+	- Datamatrix Base256 encoding was fixed.
+
 6.0.068 (2014-04-22)
 	- Some Datamatrix barcode bugs were fixed.
 
diff --git a/README.TXT b/README.TXT
index 6f1565b..35c7ad6 100644
--- a/README.TXT
+++ b/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 6.0.068
-Release date: 2014-04-22
+Version: 6.0.069
+Release date: 2014-04-24
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2014:
diff --git a/composer.json b/composer.json
index 7feb3ca..77bf3dc 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tecnick.com/tcpdf",
-	"version": "6.0.068",
+	"version": "6.0.069",
 	"homepage": "http://www.tcpdf.org/",
 	"type": "library",
 	"description": "TCPDF is a PHP class for generating PDF documents.",
diff --git a/include/barcodes/datamatrix.php b/include/barcodes/datamatrix.php
index 4092f61..e39b6f3 100644
--- a/include/barcodes/datamatrix.php
+++ b/include/barcodes/datamatrix.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : datamatrix.php
-// Version     : 1.0.005
+// Version     : 1.0.006
 // Begin       : 2010-06-07
-// Last Update : 2014-04-22
+// Last Update : 2014-04-24
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -40,7 +40,7 @@
 *
 * @package com.tecnick.tcpdf
 * @author Nicola Asuni
-* @version 1.0.005
+* @version 1.0.006
 */
 
 // custom definitions
@@ -942,17 +942,17 @@ class Datamatrix {
 					}
 					// set field lenght
 					if ($field_lenght <= 249) {
-						$cw[] = $field_lenght;
+						$cw[] = $this->get255StateCodeword($field_lenght, ($cw_num + 1));
 						++$cw_num;
 					} else {
-						$cw[] = (floor($field_lenght / 250) + 249);
-						$cw[] = ($field_lenght % 250);
+						$cw[] = $this->get255StateCodeword((floor($field_lenght / 250) + 249), ($cw_num + 1));
+						$cw[] = $this->get255StateCodeword(($field_lenght % 250), ($cw_num + 2));
 						$cw_num += 2;
 					}
 					if (!empty($temp_cw)) {
 						// add B256 field
 						foreach ($temp_cw as $p => $cht) {
-							$cw[] = $this->get255StateCodeword($chr, ($cw_num + $p));
+							$cw[] = $this->get255StateCodeword($cht, ($cw_num + $p + 1));
 						}
 					}
 					break;
diff --git a/tcpdf.php b/tcpdf.php
index 5ae1f59..793837e 100644
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.0.068
+// Version     : 6.0.069
 // Begin       : 2002-08-03
-// Last Update : 2014-04-22
+// Last Update : 2014-04-24
 // Author      : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -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.068
+ * @version 6.0.069
  */
 
 // 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.068
+ * @version 6.0.069
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF {