mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-26 06:17:33 +00:00
5.9.014
This commit is contained in:
parent
06a47e85e1
commit
52d009ebb0
@ -1,3 +1,6 @@
|
|||||||
|
5.9.014 (2010-11-15)
|
||||||
|
- Bug item #3109464 "QRCode error" was fixed.
|
||||||
|
|
||||||
5.9.013 (2010-11-15)
|
5.9.013 (2010-11-15)
|
||||||
- Bug item #3109257 "Problem with interlaced GIFs and PNGs" was fixed.
|
- Bug item #3109257 "Problem with interlaced GIFs and PNGs" was fixed.
|
||||||
- Image function now accepts image data streams (check example n. 9).
|
- Image function now accepts image data streams (check example n. 9).
|
||||||
|
@ -8,7 +8,7 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
|||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
|
|
||||||
Name: TCPDF
|
Name: TCPDF
|
||||||
Version: 5.9.013
|
Version: 5.9.014
|
||||||
Release date: 2010-11-15
|
Release date: 2010-11-15
|
||||||
Author: Nicola Asuni
|
Author: Nicola Asuni
|
||||||
|
|
||||||
|
@ -65,7 +65,7 @@
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -1004,7 +1004,7 @@ $code)</code>
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -5552,7 +5552,7 @@ $frame)</code>
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -84,7 +84,7 @@ Source Location: /tcpdf.php<br /><br />
|
|||||||
|
|
||||||
<h4>Version:</h4>
|
<h4>Version:</h4>
|
||||||
<ul>
|
<ul>
|
||||||
<li>5.9.013</li>
|
<li>5.9.014</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
@ -783,7 +783,7 @@ This is a PHP class for generating PDF documents without requiring external exte
|
|||||||
<td><b>author:</b> </td><td>Nicola Asuni - info@tecnick.com</td>
|
<td><b>author:</b> </td><td>Nicola Asuni - info@tecnick.com</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>version:</b> </td><td>5.9.013</td>
|
<td><b>version:</b> </td><td>5.9.014</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>link:</b> </td><td><a href="http://www.tcpdf.org">http://www.tcpdf.org</a></td>
|
<td><b>link:</b> </td><td><a href="http://www.tcpdf.org">http://www.tcpdf.org</a></td>
|
||||||
@ -6337,7 +6337,7 @@ This is a PHP class for generating PDF documents without requiring external exte
|
|||||||
<div class="top">[ <a href="#top">Top</a> ]</div><br />
|
<div class="top">[ <a href="#top">Top</a> ]</div><br />
|
||||||
<a name="var$tcpdf_version"></a>
|
<a name="var$tcpdf_version"></a>
|
||||||
<p></p>
|
<p></p>
|
||||||
<h4>$tcpdf_version = <span class="value"> '5.9.013'</span></h4>
|
<h4>$tcpdf_version = <span class="value"> '5.9.014'</span></h4>
|
||||||
<p>[line 164]</p>
|
<p>[line 164]</p>
|
||||||
<br /><br />
|
<br /><br />
|
||||||
<h4>Tags:</h4>
|
<h4>Tags:</h4>
|
||||||
@ -28384,7 +28384,7 @@ $file)</code>
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:09 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:22 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -300,7 +300,7 @@ $type)</code>
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -1378,7 +1378,7 @@ $type)</code>
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -18704,7 +18704,7 @@ This is a PHP class containing Unicde data for TCPDF library<br /><br /><br /><b
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:14 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:27 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -106,7 +106,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -106,7 +106,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -543,7 +543,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:14 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:27 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -98,7 +98,7 @@ Array of WEB safe colors<br /><br /><br /><br />
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -158,7 +158,7 @@ Class to create PDF417 barcode arrays for TCPDF class.<br /><br /><p>PDF417 (ISO
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -83,7 +83,7 @@ Class to create QR-code arrays for TCPDF class.<br /><br /><p>QR Code symbol is
|
|||||||
<td><b>author:</b> </td><td>Nicola Asuni</td>
|
<td><b>author:</b> </td><td>Nicola Asuni</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>version:</b> </td><td>1.0.006</td>
|
<td><b>version:</b> </td><td>1.0.007</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>copyright:</b> </td><td>2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
|
<td><b>copyright:</b> </td><td>2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
|
||||||
@ -481,7 +481,7 @@ string $string, [int $split_length = 1])</code>
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:08 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -83,7 +83,7 @@ This is a PHP class for generating PDF documents without requiring external exte
|
|||||||
<td><b>author:</b> </td><td>Nicola Asuni</td>
|
<td><b>author:</b> </td><td>Nicola Asuni</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>version:</b> </td><td>5.9.013</td>
|
<td><b>version:</b> </td><td>5.9.014</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><b>copyright:</b> </td><td>2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
|
<td><b>copyright:</b> </td><td>2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com</td>
|
||||||
@ -110,7 +110,7 @@ main configuration file<br /><br /><p>(define the K_TCPDF_EXTERNAL_CONFIG consta
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:09 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:22 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -103,7 +103,7 @@ Unicode data class for TCPDF library.<br /><br /><br /><br />
|
|||||||
|
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:14 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:27 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -2138,7 +2138,7 @@
|
|||||||
<a href="elementindex.html#top">top</a><br>
|
<a href="elementindex.html#top">top</a><br>
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -2171,7 +2171,7 @@
|
|||||||
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
|
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:20 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -35,7 +35,7 @@
|
|||||||
<a href="#Post-parsing">Post-parsing</a><br>
|
<a href="#Post-parsing">Post-parsing</a><br>
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:14 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:27 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -68,7 +68,7 @@
|
|||||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
|
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
@ -68,7 +68,7 @@
|
|||||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
|
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
|
||||||
<div class="credit">
|
<div class="credit">
|
||||||
<hr />
|
<hr />
|
||||||
Documentation generated on Mon, 15 Nov 2010 10:34:07 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
Documentation generated on Mon, 15 Nov 2010 14:09:21 +0100 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
|
||||||
</div>
|
</div>
|
||||||
</td></tr></table>
|
</td></tr></table>
|
||||||
</td>
|
</td>
|
||||||
|
24
qrcode.php
24
qrcode.php
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
//============================================================+
|
//============================================================+
|
||||||
// File name : qrcode.php
|
// File name : qrcode.php
|
||||||
// Version : 1.0.006
|
// Version : 1.0.007
|
||||||
// Begin : 2010-03-22
|
// Begin : 2010-03-22
|
||||||
// Last Update : 2010-08-30
|
// Last Update : 2010-11-15
|
||||||
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
||||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||||
// -------------------------------------------------------------------
|
// -------------------------------------------------------------------
|
||||||
@ -79,7 +79,7 @@
|
|||||||
* @copyright 2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
* @copyright 2010-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
||||||
* @link http://www.tcpdf.org
|
* @link http://www.tcpdf.org
|
||||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||||
* @version 1.0.006
|
* @version 1.0.007
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// definitions
|
// definitions
|
||||||
@ -1104,7 +1104,7 @@ if (!class_exists('QRcode', false)) {
|
|||||||
for ($y=0; $y<$width; ++$y) {
|
for ($y=0; $y<$width; ++$y) {
|
||||||
for ($x=0; $x<$width; ++$x) {
|
for ($x=0; $x<$width; ++$x) {
|
||||||
if ($bitMask[$y][$x] == 1) {
|
if ($bitMask[$y][$x] == 1) {
|
||||||
$d[$y][$x] = chr(ord($s[$y][$x]) ^ (int)$bitMask[$y][$x]);
|
$d[$y][$x] = chr(ord($s[$y][$x]) ^ ((int)($bitMask[$y][$x])));
|
||||||
}
|
}
|
||||||
$b += (int)(ord($d[$y][$x]) & 1);
|
$b += (int)(ord($d[$y][$x]) & 1);
|
||||||
}
|
}
|
||||||
@ -1576,8 +1576,8 @@ if (!class_exists('QRcode', false)) {
|
|||||||
$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02);
|
$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 4, 0x02);
|
||||||
$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']);
|
$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], $this->lengthIndicator(QR_MODE_AN, $version), $inputitem['size']);
|
||||||
for ($i=0; $i < $words; ++$i) {
|
for ($i=0; $i < $words; ++$i) {
|
||||||
$val = (int)$this->lookAnTable(ord($inputitem['data'][$i*2 ])) * 45;
|
$val = (int)($this->lookAnTable(ord($inputitem['data'][$i*2])) * 45);
|
||||||
$val += (int)$this->lookAnTable(ord($inputitem['data'][$i*2+1]));
|
$val += (int)($this->lookAnTable(ord($inputitem['data'][($i*2)+1])));
|
||||||
$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 11, $val);
|
$inputitem['bstream'] = $this->appendNum($inputitem['bstream'], 11, $val);
|
||||||
}
|
}
|
||||||
if ($inputitem['size'] & 1) {
|
if ($inputitem['size'] & 1) {
|
||||||
@ -1766,7 +1766,7 @@ if (!class_exists('QRcode', false)) {
|
|||||||
* @return int number of bits
|
* @return int number of bits
|
||||||
*/
|
*/
|
||||||
protected function estimateBitsModeNum($size) {
|
protected function estimateBitsModeNum($size) {
|
||||||
$w = (int)$size / 3;
|
$w = (int)ceil($size / 3);
|
||||||
$bits = $w * 10;
|
$bits = $w * 10;
|
||||||
switch($size - $w * 3) {
|
switch($size - $w * 3) {
|
||||||
case 1: {
|
case 1: {
|
||||||
@ -1814,7 +1814,7 @@ if (!class_exists('QRcode', false)) {
|
|||||||
* @return int number of bits
|
* @return int number of bits
|
||||||
*/
|
*/
|
||||||
protected function estimateBitsModeAn($size) {
|
protected function estimateBitsModeAn($size) {
|
||||||
$w = (int)($size / 2);
|
$w = (int)ceil($size / 2);
|
||||||
$bits = $w * 11;
|
$bits = $w * 11;
|
||||||
if ($size & 1) {
|
if ($size & 1) {
|
||||||
$bits += 6;
|
$bits += 6;
|
||||||
@ -1828,7 +1828,7 @@ if (!class_exists('QRcode', false)) {
|
|||||||
* @return int number of bits
|
* @return int number of bits
|
||||||
*/
|
*/
|
||||||
protected function estimateBitsMode8($size) {
|
protected function estimateBitsMode8($size) {
|
||||||
return $size * 8;
|
return (int)ceil($size * 8);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -1837,7 +1837,7 @@ if (!class_exists('QRcode', false)) {
|
|||||||
* @return int number of bits
|
* @return int number of bits
|
||||||
*/
|
*/
|
||||||
protected function estimateBitsModeKanji($size) {
|
protected function estimateBitsModeKanji($size) {
|
||||||
return (int)(($size / 2) * 13);
|
return (int)ceil(($size / 2) * 13);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -2070,7 +2070,7 @@ if (!class_exists('QRcode', false)) {
|
|||||||
$maxwords = $this->getDataLength($this->version, $this->level);
|
$maxwords = $this->getDataLength($this->version, $this->level);
|
||||||
$maxbits = $maxwords * 8;
|
$maxbits = $maxwords * 8;
|
||||||
if ($maxbits == $bits) {
|
if ($maxbits == $bits) {
|
||||||
return 0;
|
return $bstream;
|
||||||
}
|
}
|
||||||
if ($maxbits - $bits < 5) {
|
if ($maxbits - $bits < 5) {
|
||||||
return $this->appendNum($bstream, $maxbits - $bits, 0);
|
return $this->appendNum($bstream, $maxbits - $bits, 0);
|
||||||
@ -2331,7 +2331,7 @@ if (!class_exists('QRcode', false)) {
|
|||||||
*/
|
*/
|
||||||
protected function getMinimumVersion($size, $level) {
|
protected function getMinimumVersion($size, $level) {
|
||||||
for ($i=1; $i <= QRSPEC_VERSION_MAX; ++$i) {
|
for ($i=1; $i <= QRSPEC_VERSION_MAX; ++$i) {
|
||||||
$words = $this->capacity[$i][QRCAP_WORDS] - $this->capacity[$i][QRCAP_EC][$level];
|
$words = $this->capacity[$i][QRCAP_WORDS] - $this->capacity[$i][QRCAP_EC][$level];
|
||||||
if ($words >= $size) {
|
if ($words >= $size) {
|
||||||
return $i;
|
return $i;
|
||||||
}
|
}
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
<?php
|
<?php
|
||||||
//============================================================+
|
//============================================================+
|
||||||
// File name : tcpdf.php
|
// File name : tcpdf.php
|
||||||
// Version : 5.9.013
|
// Version : 5.9.014
|
||||||
// Begin : 2002-08-03
|
// Begin : 2002-08-03
|
||||||
// Last Update : 2010-11-15
|
// Last Update : 2010-11-15
|
||||||
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
// Author : Nicola Asuni - Tecnick.com S.r.l - Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
||||||
@ -134,7 +134,7 @@
|
|||||||
* @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
* @copyright 2002-2010 Nicola Asuni - Tecnick.com S.r.l (www.tecnick.com) Via Della Pace, 11 - 09044 - Quartucciu (CA) - ITALY - www.tecnick.com - info@tecnick.com
|
||||||
* @link http://www.tcpdf.org
|
* @link http://www.tcpdf.org
|
||||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||||
* @version 5.9.013
|
* @version 5.9.014
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -148,7 +148,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>
|
* 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>
|
||||||
* @name TCPDF
|
* @name TCPDF
|
||||||
* @package com.tecnick.tcpdf
|
* @package com.tecnick.tcpdf
|
||||||
* @version 5.9.013
|
* @version 5.9.014
|
||||||
* @author Nicola Asuni - info@tecnick.com
|
* @author Nicola Asuni - info@tecnick.com
|
||||||
* @link http://www.tcpdf.org
|
* @link http://www.tcpdf.org
|
||||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||||
@ -161,7 +161,7 @@ class TCPDF {
|
|||||||
* @var current TCPDF version
|
* @var current TCPDF version
|
||||||
* @access private
|
* @access private
|
||||||
*/
|
*/
|
||||||
private $tcpdf_version = '5.9.013';
|
private $tcpdf_version = '5.9.014';
|
||||||
|
|
||||||
// Protected properties
|
// Protected properties
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user