32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-12-23 08:58:55 +00:00
This commit is contained in:
nicolaasuni 2010-07-31 14:40:23 +02:00
parent 1e1e022c6d
commit e137edbf4f
22 changed files with 581 additions and 1037 deletions

View File

@ -1,3 +1,9 @@
5.6.000 (2010-07-31)
- A bug with object IDs was fixes.
- Performances were improved.
------------------------------------------------------------
5.5.015 (2010-07-29)
- Automatic fix for unclosed self-closing tag.
- Support for deprecated 's' and 'strike' tags was added.

View File

@ -8,8 +8,8 @@ http: sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------
Name: TCPDF
Version: 5.5.015
Release date: 2010-07-29
Version: 5.6.000
Release date: 2010-07-31
Author: Nicola Asuni
Copyright (c) 2002-2010:

View File

@ -60,7 +60,7 @@
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1003,7 +1003,7 @@ $code)</code>
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -5551,7 +5551,7 @@ $frame)</code>
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

File diff suppressed because one or more lines are too long

View File

@ -299,7 +299,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -1377,7 +1377,7 @@ $type)</code>
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -105,7 +105,7 @@ PHP class to creates array representations for 2D barcodes to be used with TCPDF
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -105,7 +105,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -542,7 +542,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:15 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -97,7 +97,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -157,7 +157,7 @@ Class to create PDF417 barcode arrays for TCPDF class.<br /><br /><p>PDF417 (ISO
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -480,7 +480,7 @@ string $string, [int $split_length = 1])</code>
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:10 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -82,7 +82,7 @@ This is a PHP class for generating PDF documents without requiring external exte
<td><b>author:</b>&nbsp;&nbsp;</td><td>Nicola Asuni</td>
</tr>
<tr>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.5.015</td>
<td><b>version:</b>&nbsp;&nbsp;</td><td>5.6.000</td>
</tr>
<tr>
<td><b>copyright:</b>&nbsp;&nbsp;</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>
@ -113,7 +113,7 @@ unicode data<br /><br /></div>
<div class="tags">
<table width="90%" border="0" cellspacing="0" cellpadding="1"><tr><td class="code_border">
<table width="100%" border="0" cellspacing="0" cellpadding="2"><tr><td class="code">
<code>PDF_PRODUCER = 'TCPDF 5.5.015 (http://www.tcpdf.org)'</code>
<code>PDF_PRODUCER = 'TCPDF 5.6.000 (http://www.tcpdf.org)'</code>
</td></tr></table>
</td></tr></table>
@ -124,7 +124,7 @@ unicode data<br /><br /></div>
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:12 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -246,7 +246,7 @@ Unicode data for TCPDF library.<br /><br /><br /><br />
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:15 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -83,16 +83,8 @@
<dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$alignmentPattern">QRcode::$alignmentPattern</a></dd>
<dt><b>$annotation_fonts</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$annotation_fonts">TCPDF::$annotation_fonts</a><br>&nbsp;&nbsp;&nbsp;&nbsp;List of fonts used on form fields (fontname =&gt; fontkey).</dd>
<dt><b>$annots_start_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$annots_start_obj_id">TCPDF::$annots_start_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Start ID for annotation objects</dd>
<dt><b>$annot_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$annot_obj_id">TCPDF::$annot_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Max ID of annotation object</dd>
<dt><b>$anTable</b></dt>
<dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$anTable">QRcode::$anTable</a></dd>
<dt><b>$apxo_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$apxo_obj_id">TCPDF::$apxo_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Current ID of appearance streams XObjects</dd>
<dt><b>$apxo_start_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$apxo_start_obj_id">TCPDF::$apxo_start_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Start ID for appearance streams XObjects</dd>
<dt><b>$author</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$author">TCPDF::$author</a></dd>
<dt><b>$AutoPageBreak</b></dt>
@ -271,8 +263,6 @@
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$current_column">TCPDF::$current_column</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Current column number</dd>
<dt><b>$currpagegroup</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$currpagegroup">TCPDF::$currpagegroup</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Contains the alias of the current page group</dd>
<dt><b>$curr_annot_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$curr_annot_obj_id">TCPDF::$curr_annot_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Current ID of annotation object</dd>
<dt><b>$customlistindent</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$customlistindent">TCPDF::$customlistindent</a></dd>
<dt><b>calcN1N3</b></dt>
@ -320,7 +310,7 @@
<dt><b>convertHTMLColorToDec</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertHTMLColorToDec">TCPDF::convertHTMLColorToDec()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).</dd>
<dt><b>convertStringToHexString</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertStringToHexString">TCPDF::convertStringToHexString()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Convert string to hexadecimal string (byte string)</dd>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertStringToHexString">TCPDF::convertStringToHexString()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Convert string to hexadecimal string (byte string)</dd>
<dt><b>convertSVGtMatrix</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertSVGtMatrix">TCPDF::convertSVGtMatrix()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Convert SVG transformation matrix to PDF.</dd>
<dt><b>CoonsPatchMesh</b></dt>
@ -389,8 +379,6 @@
<dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$eccTable">QRcode::$eccTable</a></dd>
<dt><b>$embeddedfiles</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$embeddedfiles">TCPDF::$embeddedfiles</a></dd>
<dt><b>$embedded_start_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$embedded_start_obj_id">TCPDF::$embedded_start_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Start ID for embedded file objects</dd>
<dt><b>$encoding</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$encoding">TCPDF::$encoding</a></dd>
<dt><b>$encryptdata</b></dt>
@ -724,7 +712,7 @@
<dt><b>getUserPermissionCode</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetUserPermissionCode">TCPDF::getUserPermissionCode()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the premission code used on encryption (P value).</dd>
<dt><b>getVectorsAngle</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetVectorsAngle">TCPDF::getVectorsAngle()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the angle in radiants between two vectors</dd>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetVectorsAngle">TCPDF::getVectorsAngle()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the angle in radiants between two vectors</dd>
<dt><b>getVersionPattern</b></dt>
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetVersionPattern">QRcode::getVersionPattern()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return BCH encoded version information pattern that is used for the symbol of version 7 or greater. Use lower 18 bits.</dd>
<dt><b>getWidth</b></dt>
@ -863,10 +851,6 @@
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$jpeg_quality">TCPDF::$jpeg_quality</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the default JPEG compression quality (1-100)</dd>
<dt><b>$js_objects</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$js_objects">TCPDF::$js_objects</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Javascript objects array</dd>
<dt><b>$js_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$js_obj_id">TCPDF::$js_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Current ID of javascript object</dd>
<dt><b>$js_start_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$js_start_obj_id">TCPDF::$js_start_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Start ID for javascript objects</dd>
</dl>
</div>
<a href="elementindex.html#top">top</a><br>
@ -1867,8 +1851,6 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_AES">TCPDF::_AES()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the input text exrypted using AES algorithm and the specified key.</dd>
<dt><b>_beginpage</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_beginpage">TCPDF::_beginpage()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Initialize a new page.</dd>
<dt><b>_dataannobjstring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_dataannobjstring">TCPDF::_dataannobjstring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for annotation objects</dd>
<dt><b>_datastring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_datastring">TCPDF::_datastring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for meta information</dd>
<dt><b>_datestring</b></dt>
@ -2007,8 +1989,6 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_RC4">TCPDF::_RC4()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the input text exrypted using RC4 algorithm and the specified key.</dd>
<dt><b>_setGDImageTransparency</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_setGDImageTransparency">TCPDF::_setGDImageTransparency()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the transparency for the given GD image.</dd>
<dt><b>_textannobjstring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_textannobjstring">TCPDF::_textannobjstring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a UTF-8 text string for meta information on annotations</dd>
<dt><b>_textstring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_textstring">TCPDF::_textstring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a text string for meta information</dd>
<dt><b>_toJPEG</b></dt>
@ -2020,11 +2000,11 @@
<dt><b>__construct</b></dt>
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#method__construct">QRcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__construct</b></dt>
<dd>in file barcodes.php, method <a href="com-tecnick-tcpdf/TCPDFBarcode.html#method__construct">TCPDFBarcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dd>in file 2dbarcodes.php, method <a href="com-tecnick-tcpdf/TCPDF2DBarcode.html#method__construct">TCPDF2DBarcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__construct</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method__construct">TCPDF::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__construct</b></dt>
<dd>in file 2dbarcodes.php, method <a href="com-tecnick-tcpdf/TCPDF2DBarcode.html#method__construct">TCPDF2DBarcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dd>in file barcodes.php, method <a href="com-tecnick-tcpdf/TCPDFBarcode.html#method__construct">TCPDFBarcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__construct</b></dt>
<dd>in file pdf417.php, method <a href="com-tecnick-tcpdf/PDF417.html#method__construct">PDF417::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__destruct</b></dt>
@ -2034,7 +2014,7 @@
<a href="elementindex.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -103,8 +103,6 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_AES">TCPDF::_AES()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the input text exrypted using AES algorithm and the specified key.</dd>
<dt><b>_beginpage</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_beginpage">TCPDF::_beginpage()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Initialize a new page.</dd>
<dt><b>_dataannobjstring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_dataannobjstring">TCPDF::_dataannobjstring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for annotation objects</dd>
<dt><b>_datastring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_datastring">TCPDF::_datastring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a data string for meta information</dd>
<dt><b>_datestring</b></dt>
@ -243,8 +241,6 @@
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_RC4">TCPDF::_RC4()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the input text exrypted using RC4 algorithm and the specified key.</dd>
<dt><b>_setGDImageTransparency</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_setGDImageTransparency">TCPDF::_setGDImageTransparency()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the transparency for the given GD image.</dd>
<dt><b>_textannobjstring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_textannobjstring">TCPDF::_textannobjstring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a UTF-8 text string for meta information on annotations</dd>
<dt><b>_textstring</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method_textstring">TCPDF::_textstring()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Format a text string for meta information</dd>
<dt><b>_toJPEG</b></dt>
@ -256,11 +252,11 @@
<dt><b>__construct</b></dt>
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#method__construct">QRcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__construct</b></dt>
<dd>in file barcodes.php, method <a href="com-tecnick-tcpdf/TCPDFBarcode.html#method__construct">TCPDFBarcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dd>in file 2dbarcodes.php, method <a href="com-tecnick-tcpdf/TCPDF2DBarcode.html#method__construct">TCPDF2DBarcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__construct</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#method__construct">TCPDF::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__construct</b></dt>
<dd>in file 2dbarcodes.php, method <a href="com-tecnick-tcpdf/TCPDF2DBarcode.html#method__construct">TCPDF2DBarcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dd>in file barcodes.php, method <a href="com-tecnick-tcpdf/TCPDFBarcode.html#method__construct">TCPDFBarcode::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__construct</b></dt>
<dd>in file pdf417.php, method <a href="com-tecnick-tcpdf/PDF417.html#method__construct">PDF417::__construct()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;This is the class constructor.</dd>
<dt><b>__destruct</b></dt>
@ -281,16 +277,8 @@
<dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$alignmentPattern">QRcode::$alignmentPattern</a></dd>
<dt><b>$annotation_fonts</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$annotation_fonts">TCPDF::$annotation_fonts</a><br>&nbsp;&nbsp;&nbsp;&nbsp;List of fonts used on form fields (fontname =&gt; fontkey).</dd>
<dt><b>$annots_start_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$annots_start_obj_id">TCPDF::$annots_start_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Start ID for annotation objects</dd>
<dt><b>$annot_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$annot_obj_id">TCPDF::$annot_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Max ID of annotation object</dd>
<dt><b>$anTable</b></dt>
<dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$anTable">QRcode::$anTable</a></dd>
<dt><b>$apxo_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$apxo_obj_id">TCPDF::$apxo_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Current ID of appearance streams XObjects</dd>
<dt><b>$apxo_start_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$apxo_start_obj_id">TCPDF::$apxo_start_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Start ID for appearance streams XObjects</dd>
<dt><b>$author</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$author">TCPDF::$author</a></dd>
<dt><b>$AutoPageBreak</b></dt>
@ -469,8 +457,6 @@
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$current_column">TCPDF::$current_column</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Current column number</dd>
<dt><b>$currpagegroup</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$currpagegroup">TCPDF::$currpagegroup</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Contains the alias of the current page group</dd>
<dt><b>$curr_annot_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$curr_annot_obj_id">TCPDF::$curr_annot_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Current ID of annotation object</dd>
<dt><b>$customlistindent</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$customlistindent">TCPDF::$customlistindent</a></dd>
<dt><b>calcN1N3</b></dt>
@ -518,7 +504,7 @@
<dt><b>convertHTMLColorToDec</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertHTMLColorToDec">TCPDF::convertHTMLColorToDec()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns an associative array (keys: R,G,B) from an html color name or a six-digit or three-digit hexadecimal color representation (i.e. #3FE5AA or #7FF).</dd>
<dt><b>convertStringToHexString</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertStringToHexString">TCPDF::convertStringToHexString()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Convert string to hexadecimal string (byte string)</dd>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertStringToHexString">TCPDF::convertStringToHexString()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Convert string to hexadecimal string (byte string)</dd>
<dt><b>convertSVGtMatrix</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodconvertSVGtMatrix">TCPDF::convertSVGtMatrix()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Convert SVG transformation matrix to PDF.</dd>
<dt><b>CoonsPatchMesh</b></dt>
@ -587,8 +573,6 @@
<dd>in file qrcode.php, variable <a href="com-tecnick-tcpdf/QRcode.html#var$eccTable">QRcode::$eccTable</a></dd>
<dt><b>$embeddedfiles</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$embeddedfiles">TCPDF::$embeddedfiles</a></dd>
<dt><b>$embedded_start_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$embedded_start_obj_id">TCPDF::$embedded_start_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Start ID for embedded file objects</dd>
<dt><b>$encoding</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$encoding">TCPDF::$encoding</a></dd>
<dt><b>$encryptdata</b></dt>
@ -922,7 +906,7 @@
<dt><b>getUserPermissionCode</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetUserPermissionCode">TCPDF::getUserPermissionCode()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return the premission code used on encryption (P value).</dd>
<dt><b>getVectorsAngle</b></dt>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetVectorsAngle">TCPDF::getVectorsAngle()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the angle in radiants between two vectors</dd>
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodgetVectorsAngle">TCPDF::getVectorsAngle()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Returns the angle in radiants between two vectors</dd>
<dt><b>getVersionPattern</b></dt>
<dd>in file qrcode.php, method <a href="com-tecnick-tcpdf/QRcode.html#methodgetVersionPattern">QRcode::getVersionPattern()</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Return BCH encoded version information pattern that is used for the symbol of version 7 or greater. Use lower 18 bits.</dd>
<dt><b>getWidth</b></dt>
@ -1061,10 +1045,6 @@
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$jpeg_quality">TCPDF::$jpeg_quality</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Set the default JPEG compression quality (1-100)</dd>
<dt><b>$js_objects</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$js_objects">TCPDF::$js_objects</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Javascript objects array</dd>
<dt><b>$js_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$js_obj_id">TCPDF::$js_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Current ID of javascript object</dd>
<dt><b>$js_start_obj_id</b></dt>
<dd>in file tcpdf.php, variable <a href="com-tecnick-tcpdf/TCPDF.html#var$js_start_obj_id">TCPDF::$js_start_obj_id</a><br>&nbsp;&nbsp;&nbsp;&nbsp;Start ID for javascript objects</dd>
</dl>
</div>
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
@ -2066,7 +2046,7 @@
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -35,7 +35,7 @@
<a href="#Post-parsing">Post-parsing</a><br>
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:15 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:17 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -67,7 +67,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

View File

@ -67,7 +67,7 @@
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.3</a><br />
<div class="credit">
<hr />
Documentation generated on Thu, 29 Jul 2010 17:31:09 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
Documentation generated on Sat, 31 Jul 2010 14:40:11 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.3</a>
</div>
</td></tr></table>
</td>

334
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php
//============================================================+
// File name : tcpdf.php
// Version : 5.5.015
// Version : 5.6.000
// Begin : 2002-08-03
// Last Update : 2010-07-29
// Last Update : 2010-07-31
// 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)
// -------------------------------------------------------------------
@ -126,7 +126,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
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
* @version 5.5.015
* @version 5.6.000
*/
/**
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
/**
* define default PDF document producer
*/
define('PDF_PRODUCER', 'TCPDF 5.5.015 (http://www.tcpdf.org)');
define('PDF_PRODUCER', 'TCPDF 5.6.000 (http://www.tcpdf.org)');
/**
* This is a PHP class for generating PDF documents without requiring external extensions.<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
* @package com.tecnick.tcpdf
* @version 5.5.015
* @version 5.6.000
* @author Nicola Asuni - info@tecnick.com
* @link http://www.tcpdf.org
* @license http://www.gnu.org/copyleft/lesser.html LGPL
@ -1347,34 +1347,6 @@ if (!class_exists('TCPDF', false)) {
*/
protected $page_obj_id = array();
/**
* Start ID for embedded file objects
* @access protected
* @since 4.7.000 (2009-08-29)
*/
protected $embedded_start_obj_id = 100000;
/**
* Start ID for annotation objects
* @access protected
* @since 4.7.000 (2009-08-29)
*/
protected $annots_start_obj_id = 200000;
/**
* Max ID of annotation object
* @access protected
* @since 4.7.000 (2009-08-29)
*/
protected $annot_obj_id = 200000;
/**
* Current ID of annotation object
* @access protected
* @since 4.8.003 (2009-09-15)
*/
protected $curr_annot_obj_id = 200000;
/**
* List of form annotations IDs
* @access protected
@ -1396,20 +1368,6 @@ if (!class_exists('TCPDF', false)) {
*/
protected $js_objects = array();
/**
* Start ID for javascript objects
* @access protected
* @since 4.8.000 (2009-09-07)
*/
protected $js_start_obj_id = 300000;
/**
* Current ID of javascript object
* @access protected
* @since 4.8.000 (2009-09-07)
*/
protected $js_obj_id = 300000;
/**
* Current form action (used during XHTML rendering)
* @access protected
@ -1431,20 +1389,6 @@ if (!class_exists('TCPDF', false)) {
*/
protected $form_mode = 'post';
/**
* Start ID for appearance streams XObjects
* @access protected
* @since 4.8.001 (2009-09-09)
*/
protected $apxo_start_obj_id = 400000;
/**
* Current ID of appearance streams XObjects
* @access protected
* @since 4.8.001 (2009-09-09)
*/
protected $apxo_obj_id = 400000;
/**
* List of fonts used on form fields (fontname => fontkey).
* @access protected
@ -1749,6 +1693,9 @@ if (!class_exists('TCPDF', false)) {
$this->internal_encoding = mb_internal_encoding();
mb_internal_encoding('ASCII');
}
$this->font_obj_ids = array();
$this->page_obj_id = array();
$this->form_obj_id = array();
// set disk caching
$this->diskcache = $diskcache ? true : false;
// set language direction
@ -1859,10 +1806,6 @@ if (!class_exists('TCPDF', false)) {
// PCRE unicode support is turned OFF
$this->setSpacesRE('/[\s]/');
}
$this->annot_obj_id = $this->annots_start_obj_id;
$this->curr_annot_obj_id = $this->annots_start_obj_id;
$this->apxo_obj_id = $this->apxo_start_obj_id;
$this->js_obj_id = $this->js_start_obj_id;
$this->default_form_prop = array('lineWidth'=>1, 'borderStyle'=>'solid', 'fillColor'=>array(255, 255, 255), 'strokeColor'=>array(128, 128, 128));
// set file ID for trailer
$this->file_id = md5(microtime().__FILE__.'TCPDF'.$orientation.$unit.$format.$encoding.uniqid(''.rand()));
@ -2013,7 +1956,7 @@ if (!class_exists('TCPDF', false)) {
* <li>SRA2 (450x640 mm ; 17.72x25.20 in)</li>
* <li>SRA3 (320x450 mm ; 12.60x17.72 in)</li>
* <li>SRA4 (225x320 mm ; 8.86x12.60 in)</li>
* <li><b>German DIN 476</b></li>
* <li><b>German DIN 476</b></li>
* <li>4A0 (1682x2378 mm ; 66.22x93.62 in)</li>
* <li>2A0 (1189x1682 mm ; 46.81x66.22 in)</li>
* <li><b>Variations on the ISO Standard</b></li>
@ -3369,7 +3312,6 @@ if (!class_exists('TCPDF', false)) {
if ($this->page == 0) {
$this->AddPage();
}
// save current graphic settings
$gvars = $this->getGraphicVars();
$this->lastpage();
@ -4775,9 +4717,11 @@ if (!class_exists('TCPDF', false)) {
if (!isset($this->PageAnnots[$page])) {
$this->PageAnnots[$page] = array();
}
$this->PageAnnots[$page][] = array('x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'txt' => $text, 'opt' => $opt, 'numspaces' => $spaces);
++$this->n;
$this->PageAnnots[$page][] = array('n' => $this->n, 'x' => $x, 'y' => $y, 'w' => $w, 'h' => $h, 'txt' => $text, 'opt' => $opt, 'numspaces' => $spaces);
if ((($opt['Subtype'] == 'FileAttachment') OR ($opt['Subtype'] == 'Sound')) AND (!$this->empty_string($opt['FS'])) AND file_exists($opt['FS']) AND (!isset($this->embeddedfiles[basename($opt['FS'])]))) {
$this->embeddedfiles[basename($opt['FS'])] = array('file' => $opt['FS'], 'n' => (count($this->embeddedfiles) + $this->embedded_start_obj_id));
++$this->n;
$this->embeddedfiles[basename($opt['FS'])] = array('n' => $this->n, 'file' => $opt['FS']);
}
// Add widgets annotation's icons
if (isset($opt['mk']['i']) AND file_exists($opt['mk']['i'])) {
@ -4789,7 +4733,6 @@ if (!class_exists('TCPDF', false)) {
if (isset($opt['mk']['ix']) AND file_exists($opt['mk']['ix'])) {
$this->Image($opt['mk']['ix'], '', '', 0, 0, '', '', '', false, 300, '', false, false, 0, false, true);
}
++$this->annot_obj_id;
}
/**
@ -5129,7 +5072,7 @@ if (!class_exists('TCPDF', false)) {
$op = 'S';
}
if ($this->rtl) {
$xk = (($this->x - $w) * $k);
$xk = (($this->x - $w) * $k);
} else {
$xk = ($this->x * $k);
}
@ -5328,13 +5271,13 @@ if (!class_exists('TCPDF', false)) {
}
}
}
if ($this->underline) {
if ($this->underline) {
$s .= ' '.$this->_dounderlinew($xdx, $basefonty, $width);
}
if ($this->linethrough) {
$s .= ' '.$this->_dolinethroughw($xdx, $basefonty, $width);
}
if ($this->overline) {
if ($this->overline) {
$s .= ' '.$this->_dooverlinew($xdx, $basefonty, $width);
}
if ($this->ColorFlag) {
@ -6916,7 +6859,7 @@ if (!class_exists('TCPDF', false)) {
/**
* Binary-safe and URL-safe file read.
* Reads up to length bytes from the file pointer referenced by handle. Reading stops as soon as one of the following conditions is met: length bytes have been read; EOF (end of file) is reached.
* Reads up to length bytes from the file pointer referenced by handle. Reading stops as soon as one of the following conditions is met: length bytes have been read; EOF (end of file) is reached.
* @param resource $handle
* @param int $length
* @return Returns the read string or FALSE in case of error.
@ -7605,7 +7548,7 @@ if (!class_exists('TCPDF', false)) {
//Pages root
$this->offsets[1] = $this->bufferlen;
$out = '1 0 obj'."\n";
$out .= '<< /Type /Pages /Kids [';
$out .= '<< /Type /Pages /Kids [';
foreach($this->page_obj_id as $page_obj) {
$out .= ' '.$page_obj.' 0 R';
}
@ -7640,13 +7583,9 @@ if (!class_exists('TCPDF', false)) {
}
$out = ' /Annots [';
if (isset($this->PageAnnots[$n])) {
$num_annots = count($this->PageAnnots[$n]);
for ($i = 0; $i < $num_annots; ++$i) {
++$this->curr_annot_obj_id;
if (!in_array($this->curr_annot_obj_id, $this->radio_groups)) {
$out .= ' '.$this->curr_annot_obj_id.' 0 R';
} else {
++$num_annots;
foreach ($this->PageAnnots[$n] as $key => $val) {
if (!in_array($val['n'], $this->radio_groups)) {
$out .= ' '.$val['n'].' 0 R';
}
}
}
@ -7668,24 +7607,28 @@ if (!class_exists('TCPDF', false)) {
*/
protected function _putannotsobjs() {
// reset object counter
$this->annot_obj_id = $this->annots_start_obj_id;
for ($n=1; $n <= $this->numpages; ++$n) {
if (isset($this->PageAnnots[$n])) {
// set page annotations
foreach ($this->PageAnnots[$n] as $key => $pl) {
$annot_obj_id = $this->PageAnnots[$n][$key]['n'];
// create annotation object for grouping radiobuttons
if (isset($this->radiobutton_groups[$n][$pl['txt']]) AND is_array($this->radiobutton_groups[$n][$pl['txt']])) {
$radio_button_obj_id = $this->radiobutton_groups[$n][$pl['txt']]['n'];
$this->offsets[$radio_button_obj_id] = $this->bufferlen;
$annots = '<<';
$annots .= ' /Type /Annot';
$annots .= ' /Subtype /Widget';
$annots .= ' /T '.$this->_dataannobjstring($pl['txt']);
$annots .= ' /T '.$this->_datastring($pl['txt'], $radio_button_obj_id);
$annots .= ' /FT /Btn';
$annots .= ' /Ff 49152';
$annots .= ' /Kids [';
foreach ($this->radiobutton_groups[$n][$pl['txt']] as $data) {
$annots .= ' '.$data['kid'].' 0 R';
if ($data['def'] !== 'Off') {
$defval = $data['def'];
foreach ($this->radiobutton_groups[$n][$pl['txt']] as $key => $data) {
if ($key != 'n') {
$annots .= ' '.$data['kid'].' 0 R';
if ($data['def'] !== 'Off') {
$defval = $data['def'];
}
}
}
$annots .= ' ]';
@ -7693,17 +7636,15 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' /V /'.$defval;
}
$annots .= ' >>';
++$this->annot_obj_id;
$this->offsets[$this->annot_obj_id] = $this->bufferlen;
$this->_out($this->annot_obj_id.' 0 obj'."\n".$annots."\n".'endobj');
$this->form_obj_id[] = $this->annot_obj_id;
$this->_out($radio_button_obj_id.' 0 obj'."\n".$annots."\n".'endobj');
$this->form_obj_id[] = $radio_button_obj_id;
// store object id to be used on Parent entry of Kids
$this->radiobutton_groups[$n][$pl['txt']] = $this->annot_obj_id;
$this->radiobutton_groups[$n][$pl['txt']] = $radio_button_obj_id;
}
$formfield = false;
$pl['opt'] = array_change_key_case($pl['opt'], CASE_LOWER);
$a = $pl['x'] * $this->k;
$b = $this->pagedim[$n]['h'] - (($pl['y'] + $pl['h']) * $this->k);
$b = $this->pagedim[$n]['h'] - (($pl['y'] + $pl['h']) * $this->k);
$c = $pl['w'] * $this->k;
$d = $pl['h'] * $this->k;
$rect = sprintf('%.2F %.2F %.2F %.2F', $a, $b, $a+$c, $b+$d);
@ -7716,9 +7657,9 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' /FT /'.$pl['opt']['ft'];
$formfield = true;
}
$annots .= ' /Contents '.$this->_textannobjstring($pl['txt']);
$annots .= ' /Contents '.$this->_textstring($pl['txt'], $annot_obj_id);
$annots .= ' /P '.$this->page_obj_id[$n].' 0 R';
$annots .= ' /NM '.$this->_dataannobjstring(sprintf('%04u-%04u', $n, $key));
$annots .= ' /NM '.$this->_datastring(sprintf('%04u-%04u', $n, $key), $annot_obj_id);
$annots .= ' /M '.$this->_datestring();
if (isset($pl['opt']['f'])) {
$val = 0;
@ -7868,19 +7809,19 @@ if (!class_exists('TCPDF', false)) {
if (in_array(strtolower($pl['opt']['subtype']), $markups)) {
// this is a markup type
if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) {
$annots .= ' /T '.$this->_textannobjstring($pl['opt']['t']);
$annots .= ' /T '.$this->_textstring($pl['opt']['t'], $annot_obj_id);
}
//$annots .= ' /Popup ';
if (isset($pl['opt']['ca'])) {
$annots .= ' /CA '.sprintf('%.4F', floatval($pl['opt']['ca']));
}
if (isset($pl['opt']['rc'])) {
$annots .= ' /RC '.$this->_textannobjstring($pl['opt']['rc']);
$annots .= ' /RC '.$this->_textstring($pl['opt']['rc'], $annot_obj_id);
}
$annots .= ' /CreationDate '.$this->_datestring();
//$annots .= ' /IRT ';
if (isset($pl['opt']['subj'])) {
$annots .= ' /Subj '.$this->_textannobjstring($pl['opt']['subj']);
$annots .= ' /Subj '.$this->_textstring($pl['opt']['subj'], $annot_obj_id);
}
//$annots .= ' /RT ';
//$annots .= ' /IT ';
@ -7925,11 +7866,11 @@ if (!class_exists('TCPDF', false)) {
case 'link': {
if(is_string($pl['txt'])) {
// external URI link
$annots .= ' /A <</S /URI /URI '.$this->_dataannobjstring($this->unhtmlentities($pl['txt'])).'>>';
$annots .= ' /A <</S /URI /URI '.$this->_datastring($this->unhtmlentities($pl['txt']), $annot_obj_id).'>>';
} else {
// internal link
$l = $this->links[$pl['txt']];
$annots .= sprintf(' /Dest [%d 0 R /XYZ 0 %.2F null]', (1 + (2 * $l[0])), ($this->pagedim[$l[0]]['h'] - ($l[1] * $this->k)));
$annots .= sprintf(' /Dest [%d 0 R /XYZ 0 %.2F null]', $this->page_obj_id[($l[0])], ($this->pagedim[$l[0]]['h'] - ($l[1] * $this->k)));
}
$hmodes = array('N', 'I', 'O', 'P');
if (isset($pl['opt']['h']) AND in_array($pl['opt']['h'], $hmodes)) {
@ -7949,10 +7890,10 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' /Q '.intval($pl['opt']['q']);
}
if (isset($pl['opt']['rc'])) {
$annots .= ' /RC '.$this->_textannobjstring($pl['opt']['rc']);
$annots .= ' /RC '.$this->_textstring($pl['opt']['rc'], $annot_obj_id);
}
if (isset($pl['opt']['ds'])) {
$annots .= ' /DS '.$this->_textannobjstring($pl['opt']['ds']);
$annots .= ' /DS '.$this->_textstring($pl['opt']['ds'], $annot_obj_id);
}
if (isset($pl['opt']['cl']) AND is_array($pl['opt']['cl'])) {
$annots .= ' /CL [';
@ -8022,7 +7963,7 @@ if (!class_exists('TCPDF', false)) {
}
$filename = basename($pl['opt']['fs']);
if (isset($this->embeddedfiles[$filename]['n'])) {
$annots .= ' /FS <</Type /Filespec /F '.$this->_dataannobjstring($filename).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
$annots .= ' /FS <</Type /Filespec /F '.$this->_datastring($filename, $annot_obj_id).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
$iconsapp = array('Graph', 'Paperclip', 'PushPin', 'Tag');
if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
$annots .= ' /Name /'.$pl['opt']['name'];
@ -8040,7 +7981,7 @@ if (!class_exists('TCPDF', false)) {
if (isset($this->embeddedfiles[$filename]['n'])) {
// ... TO BE COMPLETED ...
// /R /C /B /E /CO /CP
$annots .= ' /Sound <</Type /Filespec /F '.$this->_dataannobjstring($filename).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
$annots .= ' /Sound <</Type /Filespec /F '.$this->_datastring($filename, $annot_obj_id).' /EF <</F '.$this->embeddedfiles[$filename]['n'].' 0 R>> >>';
$iconsapp = array('Speaker', 'Mic');
if (isset($pl['opt']['name']) AND in_array($pl['opt']['name'], $iconsapp)) {
$annots .= ' /Name /'.$pl['opt']['name'];
@ -8119,7 +8060,7 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' /S /'.$pl['opt']['mk']['if']['s'];
}
if (isset($pl['opt']['mk']['if']['a']) AND (is_array($pl['opt']['mk']['if']['a'])) AND !empty($pl['opt']['mk']['if']['a'])) {
$annots .= sprintf(' /A [%.2F %.2F]', $pl['opt']['mk']['if']['a'][0], $pl['opt']['mk']['if']['a'][1]);
$annots .= sprintf(' /A [%.2F %.2F]', $pl['opt']['mk']['if']['a'][0], $pl['opt']['mk']['if']['a'][1]);
}
if (isset($pl['opt']['mk']['if']['fb']) AND ($pl['opt']['mk']['if']['fb'])) {
$annots .= ' /FB true';
@ -8139,13 +8080,13 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' /Parent '.$this->radiobutton_groups[$n][$pl['txt']].' 0 R';
}
if (isset($pl['opt']['t']) AND is_string($pl['opt']['t'])) {
$annots .= ' /T '.$this->_dataannobjstring($pl['opt']['t']);
$annots .= ' /T '.$this->_datastring($pl['opt']['t'], $annot_obj_id);
}
if (isset($pl['opt']['tu']) AND is_string($pl['opt']['tu'])) {
$annots .= ' /TU '.$this->_dataannobjstring($pl['opt']['tu']);
$annots .= ' /TU '.$this->_datastring($pl['opt']['tu'], $annot_obj_id);
}
if (isset($pl['opt']['tm']) AND is_string($pl['opt']['tm'])) {
$annots .= ' /TM '.$this->_dataannobjstring($pl['opt']['tm']);
$annots .= ' /TM '.$this->_datastring($pl['opt']['tm'], $annot_obj_id);
}
if (isset($pl['opt']['ff'])) {
if (is_array($pl['opt']['ff'])) {
@ -8172,7 +8113,7 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' '.$optval;
}
} else {
$annots .= ' '.$this->_textannobjstring($pl['opt']['v']);
$annots .= ' '.$this->_textstring($pl['opt']['v'], $annot_obj_id);
}
}
if (isset($pl['opt']['dv'])) {
@ -8185,7 +8126,7 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' '.$optval;
}
} else {
$annots .= ' '.$this->_textannobjstring($pl['opt']['dv']);
$annots .= ' '.$this->_textstring($pl['opt']['dv'], $annot_obj_id);
}
}
if (isset($pl['opt']['rv'])) {
@ -8198,7 +8139,7 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' '.$optval;
}
} else {
$annots .= ' '.$this->_textannobjstring($pl['opt']['rv']);
$annots .= ' '.$this->_textstring($pl['opt']['rv'], $annot_obj_id);
}
}
if (isset($pl['opt']['a']) AND !empty($pl['opt']['a'])) {
@ -8217,9 +8158,9 @@ if (!class_exists('TCPDF', false)) {
$annots .= ' /Opt [';
foreach($pl['opt']['opt'] AS $copt) {
if (is_array($copt)) {
$annots .= ' ['.$this->_textannobjstring($copt[0]).' '.$this->_textannobjstring($copt[1]).']';
$annots .= ' ['.$this->_textstring($copt[0], $annot_obj_id).' '.$this->_textstring($copt[1], $annot_obj_id).']';
} else {
$annots .= ' '.$this->_textannobjstring($copt);
$annots .= ' '.$this->_textstring($copt, $annot_obj_id);
}
}
$annots .= ']';
@ -8257,12 +8198,11 @@ if (!class_exists('TCPDF', false)) {
}
$annots .= '>>';
// create new annotation object
++$this->annot_obj_id;
$this->offsets[$this->annot_obj_id] = $this->bufferlen;
$this->_out($this->annot_obj_id.' 0 obj'."\n".$annots."\n".'endobj');
if ($formfield AND ! isset($this->radiobutton_groups[$n][$pl['txt']])) {
$this->offsets[$annot_obj_id] = $this->bufferlen;
$this->_out($annot_obj_id.' 0 obj'."\n".$annots."\n".'endobj');
if ($formfield AND !isset($this->radiobutton_groups[$n][$pl['txt']])) {
// store reference of form object
$this->form_obj_id[] = $this->annot_obj_id;
$this->form_obj_id[] = $annot_obj_id;
}
}
}
@ -8280,9 +8220,9 @@ if (!class_exists('TCPDF', false)) {
*/
protected function _putAPXObject($w=0, $h=0, $stream='') {
$stream = trim($stream);
++$this->apxo_obj_id;
$this->offsets[$this->apxo_obj_id] = $this->bufferlen;
$out = $this->apxo_obj_id.' 0 obj'."\n";
++$this->n;
$this->offsets[$this->n] = $this->bufferlen;
$out = $this->n.' 0 obj'."\n";
$out .= '<<';
$out .= ' /Type /XObject';
$out .= ' /Subtype /Form';
@ -8301,7 +8241,7 @@ if (!class_exists('TCPDF', false)) {
$out .= ' stream'."\n".$stream."\n".'endstream';
$out .= "\n".'endobj';
$this->_out($out);
return $this->apxo_obj_id;
return $this->n;
}
/**
@ -9864,50 +9804,6 @@ if (!class_exists('TCPDF', false)) {
$objid_info = $this->_putinfo();
// Catalog
$objid_catalog = $this->_putcatalog();
// Normalize Object IDs
$buffer = $this->getBuffer(); // (requires a lot of memory)
// Embedded Files
if (isset($this->embeddedfiles) AND count($this->embeddedfiles) > 0) {
foreach ($this->embeddedfiles as $filename => $filedata) {
++$this->n;
$this->offsets[$this->n] = $this->offsets[$filedata['n']];
$newobjid = sprintf('% 6u', $this->n);
$buffer = str_replace(''.$filedata['n'].' 0 R', ''.$newobjid.' 0 R', $buffer);
$buffer = str_replace(''.$filedata['n'].' 0 obj', ''.$newobjid.' 0 obj', $buffer);
}
}
// Annotation Objects
if ($this->annot_obj_id > $this->annots_start_obj_id) {
for ($i = ($this->annots_start_obj_id + 1); $i <= $this->annot_obj_id; ++$i) {
++$this->n;
$this->offsets[$this->n] = $this->offsets[$i];
$newobjid = sprintf('% 6u', $this->n);
$buffer = str_replace($i.' 0 R', $newobjid.' 0 R', $buffer);
$buffer = str_replace($i.' 0 obj', $newobjid.' 0 obj', $buffer);
}
}
// Javascript Objects
if ($this->js_obj_id > $this->js_start_obj_id) {
for ($i = ($this->js_start_obj_id + 1); $i <= $this->js_obj_id; ++$i) {
++$this->n;
$this->offsets[$this->n] = $this->offsets[$i];
$newobjid = sprintf('% 6u', $this->n);
$buffer = str_replace($i.' 0 R', $newobjid.' 0 R', $buffer);
$buffer = str_replace($i.' 0 obj', $newobjid.' 0 obj', $buffer);
}
}
// Appearance streams XObjects
if ($this->apxo_obj_id > $this->apxo_start_obj_id) {
for ($i = ($this->apxo_start_obj_id + 1); $i <= $this->apxo_obj_id; ++$i) {
++$this->n;
$this->offsets[$this->n] = $this->offsets[$i];
$newobjid = sprintf('% 6u', $this->n);
$buffer = str_replace($i.' 0 R', $newobjid.' 0 R', $buffer);
$buffer = str_replace($i.' 0 obj', $newobjid.' 0 obj', $buffer);
}
}
// overwrite buffer
$this->replaceBuffer($buffer);
// Cross-ref
$o = $this->bufferlen;
// XREF section
@ -10115,22 +10011,15 @@ if (!class_exists('TCPDF', false)) {
/**
* Format a data string for meta information
* @param string $s data string to escape.
* @param int $n object ID
* @return string escaped string.
* @access protected
*/
protected function _datastring($s) {
$s = $this->_encrypt_data($this->n, $s);
return '('. $this->_escape($s).')';
}
/**
* Format a data string for annotation objects
* @param string $s data string to escape.
* @return string escaped string.
* @access protected
*/
protected function _dataannobjstring($s) {
$s = $this->_encrypt_data(($this->annot_obj_id + 1), $s);
protected function _datastring($s, $n=0) {
if ($n == 0) {
$n = $this->n;
}
$s = $this->_encrypt_data($n, $s);
return '('. $this->_escape($s).')';
}
@ -10148,29 +10037,16 @@ if (!class_exists('TCPDF', false)) {
/**
* Format a text string for meta information
* @param string $s string to escape.
* @param int $n object ID
* @return string escaped string.
* @access protected
*/
protected function _textstring($s) {
protected function _textstring($s, $n=0) {
if ($this->isunicode) {
//Convert string to UTF-16BE
$s = $this->UTF8ToUTF16BE($s, true);
}
return $this->_datastring($s);
}
/**
* Format a UTF-8 text string for meta information on annotations
* @param string $s string to escape.
* @return string escaped string.
* @access protected
*/
protected function _textannobjstring($s) {
if ($this->isunicode) {
//Convert string to UTF-16BE
$s = $this->UTF8ToUTF16BE($s, true);
}
return $this->_dataannobjstring($s);
return $this->_datastring($s, $n);
}
/**
@ -10311,7 +10187,7 @@ if (!class_exists('TCPDF', false)) {
$unichar = -1; // last unicode char
$unicode = array(); // array containing unicode values
$bytes = array(); // array containing single character byte sequences
$numbytes = 1; // number of octetc needed to represent the UTF-8 character
$numbytes = 1; // number of octetc needed to represent the UTF-8 character
$str .= ''; // force $str to be a string
$length = strlen($str);
for ($i = 0; $i < $length; ++$i) {
@ -10769,8 +10645,7 @@ if (!class_exists('TCPDF', false)) {
if (!$this->encrypted) {
return;
}
$this->_newobj();
$this->encryptdata['objid'] = $this->n;
$this->encryptdata['objid'] = $this->_newobj();
$out = '<<';
if (!isset($this->encryptdata['Filter']) OR empty($this->encryptdata['Filter'])) {
$this->encryptdata['Filter'] = 'Standard';
@ -11235,7 +11110,7 @@ if (!class_exists('TCPDF', false)) {
}
/**
* Convert string to hexadecimal string (byte string)
* Convert string to hexadecimal string (byte string)
* @param string $s string to convert
* @return byte string
* @access protected
@ -12420,7 +12295,7 @@ if (!class_exists('TCPDF', false)) {
/**
* Reverse the RLT substrings using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
* @param string $str string to manipulate.
* @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
* @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
* @param bool $forcertl if true forces RTL text direction
* @return string
* @access protected
@ -12435,7 +12310,7 @@ if (!class_exists('TCPDF', false)) {
* Reverse the RLT substrings array using the Bidirectional Algorithm (http://unicode.org/reports/tr9/).
* @param array $arr array of unicode values.
* @param string $str string to manipulate (or empty value).
* @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
* @param bool $setbom if true set the Byte Order Mark (BOM = 0xFEFF)
* @param bool $forcertl if true forces RTL text direction
* @return string
* @access protected
@ -13067,7 +12942,7 @@ if (!class_exists('TCPDF', false)) {
$outline_p = array();
$outline_y = array();
foreach ($this->outlines as $key => $row) {
$outline_p[$key] = $row['p'];
$outline_p[$key] = $row['p'];
$outline_k[$key] = $key;
}
// sort outlines by page and original position
@ -13120,14 +12995,13 @@ if (!class_exists('TCPDF', false)) {
if (isset($o['last'])) {
$out .= ' /Last '.($n + $o['last']).' 0 R';
}
$out .= ' '.sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]', (1 + (2 * $o['p'])), ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
$out .= ' '.sprintf('/Dest [%d 0 R /XYZ 0 %.2F null]', $this->page_obj_id[($o['p'])], ($this->pagedim[$o['p']]['h'] - ($o['y'] * $this->k)));
$out .= ' /Count 0 >>';
$out .= "\n".'endobj';
$this->_out($out);
}
//Outline root
$this->_newobj();
$this->OutlineRoot = $this->n;
$this->OutlineRoot = $this->_newobj();
$this->_out('<< /Type /Outlines /First '.$n.' 0 R /Last '.($n + $lru[0]).' 0 R >>'."\n".'endobj');
}
@ -13154,9 +13028,9 @@ if (!class_exists('TCPDF', false)) {
* @since 4.8.000 (2009-09-07)
*/
public function addJavascriptObject($script, $onload=false) {
++$this->js_obj_id;
$this->js_objects[$this->js_obj_id] = array('js' => $script, 'onload' => $onload);
return $this->js_obj_id;
++$this->n;
$this->js_objects[$this->n] = array('n' => $this->n, 'js' => $script, 'onload' => $onload);
return $this->n;
}
/**
@ -13788,11 +13662,12 @@ if (!class_exists('TCPDF', false)) {
}
if (!isset($this->radiobutton_groups[$this->page][$name])) {
$this->radiobutton_groups[$this->page][$name] = array();
++$this->annot_obj_id;
$this->radio_groups[] = $this->annot_obj_id;
++$this->n;
$this->radiobutton_groups[$this->page][$name]['n'] = $this->n;
$this->radio_groups[] = $this->n;
}
// save object ID to be added on Kids entry on parent object
$this->radiobutton_groups[$this->page][$name][] = array('kid' => ($this->annot_obj_id + 1), 'def' => $defval);
$this->radiobutton_groups[$this->page][$name][] = array('kid' => ($this->n + 1), 'def' => $defval);
// get default style
$prop = array_merge($this->getFormDefaultProp(), $prop);
$prop['NoToggleToOff'] = 'true';
@ -14341,7 +14216,7 @@ if (!class_exists('TCPDF', false)) {
$this->signature_appearance['page'] = intval($page);
}
$a = $x * $this->k;
$b = $this->pagedim[($this->signature_appearance['page'])]['h'] - (($y + $h) * $this->k);
$b = $this->pagedim[($this->signature_appearance['page'])]['h'] - (($y + $h) * $this->k);
$c = $w * $this->k;
$d = $h * $this->k;
$this->signature_appearance['rect'] = sprintf('%.2F %.2F %.2F %.2F', $a, $b, $a+$c, $b+$d);
@ -14505,11 +14380,9 @@ if (!class_exists('TCPDF', false)) {
* @since 3.0.000 (2008-03-27)
*/
protected function _putocg() {
$this->_newobj();
$this->n_ocg_print = $this->n;
$this->n_ocg_print = $this->_newobj();
$this->_out('<< /Type /OCG /Name '.$this->_textstring('print').' /Usage << /Print <</PrintState /ON>> /View <</ViewState /OFF>> >> >>'."\n".'endobj');
$this->_newobj();
$this->n_ocg_view = $this->n;
$this->n_ocg_view = $this->_newobj();
$this->_out('<< /Type /OCG /Name '.$this->_textstring('view').' /Usage << /Print <</PrintState /OFF>> /View <</ViewState /ON>> >> >>'."\n".'endobj');
}
@ -14589,8 +14462,7 @@ if (!class_exists('TCPDF', false)) {
protected function _putextgstates() {
$ne = count($this->extgstates);
for ($i = 1; $i <= $ne; ++$i) {
$this->_newobj();
$this->extgstates[$i]['n'] = $this->n;
$this->extgstates[$i]['n'] = $this->_newobj();
$out = '<< /Type /ExtGState';
foreach ($this->extgstates[$i]['parms'] as $k => $v) {
if (is_float($v)) {
@ -15145,8 +15017,7 @@ if (!class_exists('TCPDF', false)) {
$idt = count($this->gradients); //index for transparency gradients
foreach ($this->gradients as $id => $grad) {
if (($grad['type'] == 2) OR ($grad['type'] == 3)) {
$this->_newobj();
$fc = $this->n;
$fc = $this->_newobj();
$out = '<<';
$out .= ' /FunctionType 3';
$out .= ' /Domain [0 1]';
@ -15183,8 +15054,7 @@ if (!class_exists('TCPDF', false)) {
}
// set transparency fuctions
if ($grad['transparency']) {
$this->_newobj();
$ft = $this->n;
$ft = $this->_newobj();
$out = '<<';
$out .= ' /FunctionType 3';
$out .= ' /Domain [0 1]';
@ -15804,7 +15674,7 @@ if (!class_exists('TCPDF', false)) {
if ($v['t']) {
// draw a vertical bar
$ypos = $y + $style['padding'] + ($v['p'] * $barh / $arrcode['maxh']);
$this->Rect($xpos, $ypos, $bw, ($v['h'] * $barh / $arrcode['maxh']), 'F', array(), $style['fgcolor']);
$this->Rect($xpos, $ypos, $bw, ($v['h'] * $barh / $arrcode['maxh']), 'F', array(), $style['fgcolor']);
}
$xpos += $bw;
}
@ -16118,7 +15988,7 @@ if (!class_exists('TCPDF', false)) {
/**
* Returns an array containing current margins:
* <ul>
<li>$ret['left'] = left margin</li>
<li>$ret['left'] = left margin</li>
<li>$ret['right'] = right margin</li>
<li>$ret['top'] = top margin</li>
<li>$ret['bottom'] = bottom margin</li>
@ -16146,7 +16016,7 @@ if (!class_exists('TCPDF', false)) {
/**
* Returns an array containing original margins:
* <ul>
<li>$ret['left'] = left margin</li>
<li>$ret['left'] = left margin</li>
<li>$ret['right'] = right margin</li>
* </ul>
* @return array containing all margins measures
@ -17985,7 +17855,7 @@ if (!class_exists('TCPDF', false)) {
$rsendx += $dl;
}
}
if (($trwsp['rowspan'] > 0)
if (($trwsp['rowspan'] > 0)
AND ($rsstartx > ($this->x - $cellspacing - $currentcmargin - $this->feps))
AND ($rsstartx < ($this->x + $cellspacing + $currentcmargin + $this->feps))
AND (($trwsp['starty'] < ($this->y - $this->feps)) OR ($trwsp['startpage'] < $this->page))) {
@ -18518,7 +18388,7 @@ if (!class_exists('TCPDF', false)) {
$this->ImageEps($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, true, $align, '', $border, true);
} elseif ($type == 'svg') {
$this->ImageSVG($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, $imglink, $align, '', $border, true);
} else {
} else {
$this->Image($tag['attribute']['src'], $xpos, $this->y, $iw, $ih, '', $imglink, $align, false, 300, '', false, false, $border, false, false, true);
}
switch($align) {
@ -21471,7 +21341,7 @@ if (!class_exists('TCPDF', false)) {
xml_parser_free($this->parser);
// restore previous graphic state
$this->_out($this->epsmarker.'Q');
// restore graphic vars
// restore graphic vars
$this->setGraphicVars($gvars);
if (!empty($border)) {
$bx = $this->x;
@ -21630,7 +21500,7 @@ if (!class_exists('TCPDF', false)) {
* @since 5.0.000 (2010-05-02)
* @access protected
*/
protected function getTransformationMatrixProduct($ta, $tb) {
protected function getTransformationMatrixProduct($ta, $tb) {
$tm = array();
$tm[0] = ($ta[0] * $tb[0]) + ($ta[2] * $tb[1]);
$tm[1] = ($ta[1] * $tb[0]) + ($ta[3] * $tb[1]);
@ -21687,7 +21557,7 @@ if (!class_exists('TCPDF', false)) {
* @since 5.0.000 (2010-05-02)
* @access protected
*/
protected function setSVGStyles($svgstyle, $prevsvgstyle, $x=0, $y=0, $w=1, $h=1, $clip_function='', $clip_params=array()) {
protected function setSVGStyles($svgstyle, $prevsvgstyle, $x=0, $y=0, $w=1, $h=1, $clip_function='', $clip_params=array()) {
$objstyle = '';
if(!isset($svgstyle['opacity'])) {
return $objstyle;
@ -22251,7 +22121,7 @@ if (!class_exists('TCPDF', false)) {
}
/**
* Returns the angle in radiants between two vectors
* Returns the angle in radiants between two vectors
* @param int $x1 X coordiante of first vector point
* @param int $y1 Y coordiante of first vector point
* @param int $x2 X coordiante of second vector point