From f4fe9a9fca753538e25096bf099a328e74fb0061 Mon Sep 17 00:00:00 2001
From: nicolaasuni <info@tecnick.com>
Date: Thu, 12 Jan 2012 07:45:11 +0000
Subject: [PATCH] 5.9.144

---
 2dbarcodes.php | 11 +++++------
 CHANGELOG.TXT  |  3 +++
 README.TXT     |  6 +++---
 barcodes.php   | 10 +++++-----
 tcpdf.php      | 10 +++++-----
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/2dbarcodes.php b/2dbarcodes.php
index ebb4f0d..e04b307 100755
--- a/2dbarcodes.php
+++ b/2dbarcodes.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : 2dbarcodes.php
-// Version     : 1.0.012
+// Version     : 1.0.013
 // Begin       : 2009-04-07
-// Last Update : 2011-09-15
+// Last Update : 2012-01-12
 // Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -37,14 +37,14 @@
  * PHP class to creates array representations for 2D barcodes to be used with TCPDF.
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 1.0.012
+ * @version 1.0.013
  */
 
 /**
  * @class TCPDF2DBarcode
  * PHP class to creates array representations for 2D barcodes to be used with TCPDF (http://www.tcpdf.org).
  * @package com.tecnick.tcpdf
- * @version 1.0.012
+ * @version 1.0.013
  * @author Nicola Asuni
  */
 class TCPDF2DBarcode {
@@ -142,8 +142,7 @@ class TCPDF2DBarcode {
  	 * @public
 	 */
 	public function getBarcodeHTML($w=10, $h=10, $color='black') {
-		// replace table for special characters
-		$html = '<div style="font-size:0;position:relative;">'."\n";
+		$html = '<div style="font-size:0;position:relative;width:'.($w * $this->barcode_array['num_cols']).'px;height:'.($h * $this->barcode_array['num_rows']).'px;">'."\n";
 		// print barcode elements
 		$y = 0;
 		// for each row
diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index 773019c..6b41d5a 100755
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+5.9.144 (2012-01-12)
+	- HTML output on barcode classes was improved.
+
 5.9.143 (2012-01-08)
 	- Bug item #3471057 "setCreator() has no effect" was fixed.
 
diff --git a/README.TXT b/README.TXT
index cfc5116..9df8aa9 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.143
-Release date: 2012-01-08
+Version: 5.9.144
+Release date: 2012-01-12
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2012:
@@ -68,7 +68,7 @@ For Additional Documentation:
 	http://www.tcpdf.org
 
 License
-	Copyright (C) 2002-2011  Nicola Asuni - Tecnick.com LTD
+	Copyright (C) 2002-2012  Nicola Asuni - Tecnick.com LTD
 
 	TCPDF is free software: you can redistribute it and/or modify it
 	under the terms of the GNU Lesser General Public License as
diff --git a/barcodes.php b/barcodes.php
index 88bf316..0e33f18 100755
--- a/barcodes.php
+++ b/barcodes.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : barcodes.php
-// Version     : 1.0.021
+// Version     : 1.0.022
 // Begin       : 2008-06-09
-// Last Update : 2011-09-15
+// Last Update : 2012-01-12
 // Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -37,14 +37,14 @@
  * PHP class to creates array representations for common 1D barcodes to be used with TCPDF.
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 1.0.021
+ * @version 1.0.022
  */
 
 /**
  * @class TCPDFBarcode
  * PHP class to creates array representations for common 1D barcodes to be used with TCPDF (http://www.tcpdf.org).<br>
  * @package com.tecnick.tcpdf
- * @version 1.0.021
+ * @version 1.0.022
  * @author Nicola Asuni
  */
 class TCPDFBarcode {
@@ -145,8 +145,8 @@ class TCPDFBarcode {
  	 * @public
 	 */
 	public function getBarcodeHTML($w=2, $h=30, $color='black') {
-		// replace table for special characters
 		$html = '<div style="font-size:0;position:relative;">'."\n";
+		$html = '<div style="font-size:0;position:relative;width:'.($this->barcode_array['maxw'] * $w).'px;height:'.($h).'px;">'."\n";
 		// print bars
 		$x = 0;
 		foreach ($this->barcode_array['bcode'] as $k => $v) {
diff --git a/tcpdf.php b/tcpdf.php
index 7b53ad1..376c79d 100755
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 5.9.143
+// Version     : 5.9.144
 // Begin       : 2002-08-03
-// Last Update : 2012-01-08
+// Last Update : 2012-01-12
 // Author      : Nicola Asuni - Tecnick.com LTD - Manor Coach House, Church Hill, Aldershot, Hants, GU12 4RQ, UK - www.tecnick.com - info@tecnick.com
 // License     : http://www.tecnick.com/pagefiles/tcpdf/LICENSE.TXT GNU-LGPLv3 + YOU CAN'T REMOVE ANY TCPDF COPYRIGHT NOTICE OR LINK FROM THE GENERATED PDF DOCUMENTS.
 // -------------------------------------------------------------------
@@ -139,7 +139,7 @@
  * Tools to encode your unicode fonts are on fonts/utils directory.</p>
  * @package com.tecnick.tcpdf
  * @author Nicola Asuni
- * @version 5.9.143
+ * @version 5.9.144
  */
 
 // Main configuration file. Define the K_TCPDF_EXTERNAL_CONFIG constant to skip this file.
@@ -151,7 +151,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.<br>
  * @package com.tecnick.tcpdf
  * @brief PHP class for generating PDF documents without requiring external extensions.
- * @version 5.9.143
+ * @version 5.9.144
  * @author Nicola Asuni - info@tecnick.com
  */
 class TCPDF {
@@ -162,7 +162,7 @@ class TCPDF {
 	 * Current TCPDF version.
 	 * @private
 	 */
-	private $tcpdf_version = '5.9.143';
+	private $tcpdf_version = '5.9.144';
 
 	// Protected properties