mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-26 06:17:33 +00:00
4.6.025
This commit is contained in:
nicolaasuni
parent
075d25d56e
commit
8c917d7213
@ -2,7 +2,7 @@
|
||||
//============================================================+
|
||||
// File name : 2dbarcodes.php
|
||||
// Begin : 2009-04-07
|
||||
// Last Update : 2009-04-08
|
||||
// Last Update : 2009-08-17
|
||||
// Version : 1.0.000
|
||||
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
@ -1,3 +1,7 @@
|
||||
4.6.025 (2009-08-17)
|
||||
- Carriage returns (\r) were removed from source code.
|
||||
- Problem related to set_magic_quotes_runtime() depracated was fixed.
|
||||
|
||||
4.6.024 (2009-08-07)
|
||||
- Bug item #2833556 "justification using other units than mm" was fixed.
|
||||
- Documentation was fixed/updated.
|
||||
|
||||
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 4.6.024
|
||||
Release date: 2009-08-07
|
||||
Version: 4.6.025
|
||||
Release date: 2009-08-17
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2001-2009:
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
//============================================================+
|
||||
// File name : barcodes.php
|
||||
// Begin : 2008-06-09
|
||||
// Last Update : 2009-04-15
|
||||
// Last Update : 2009-08-17
|
||||
// Version : 1.0.008
|
||||
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
@ -45,7 +45,7 @@
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 17:59:54 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1368,7 +1368,7 @@ $type)</code>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 17:59:54 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -96,7 +96,7 @@ PHP class to creates array representations for common 1D barcodes to be used wit
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 17:59:54 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -507,7 +507,7 @@ Configuration file for TCPDF.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 18:00:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -88,7 +88,7 @@ Array of WEB safe colors.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:26 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 17:59:55 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -73,7 +73,7 @@ This is a PHP class for generating PDF documents without requiring external exte
|
||||
<td><b>author:</b> </td><td>Nicola Asuni</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>version:</b> </td><td>4.6.024</td>
|
||||
<td><b>version:</b> </td><td>4.6.025</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><b>copyright:</b> </td><td>2002-2009 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>
|
||||
@ -104,7 +104,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 4.6.024 (http://www.tcpdf.org)'</code>
|
||||
<code>PDF_PRODUCER = 'TCPDF 4.6.025 (http://www.tcpdf.org)'</code>
|
||||
</td></tr></table>
|
||||
</td></tr></table>
|
||||
|
||||
@ -115,7 +115,7 @@ unicode data<br /><br /></div>
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:26 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 17:59:56 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -237,7 +237,7 @@ Unicode Include file for TCPDF.<br /><br /><br /><br />
|
||||
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 18:00:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -457,6 +457,8 @@
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGetX">TCPDF::GetX()</a><br> Returns the relative X value of current position.</dd>
|
||||
<dt><b>GetY</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGetY">TCPDF::GetY()</a><br> Returns the ordinate of the current position.</dd>
|
||||
<dt><b>get_mqr</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodget_mqr">TCPDF::get_mqr()</a><br> Gets the current active configuration setting of magic_quotes_runtime (if the get_magic_quotes_runtime function exist)</dd>
|
||||
<dt><b>Gradient</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGradient">TCPDF::Gradient()</a><br> Output gradient.</dd>
|
||||
</dl>
|
||||
@ -1061,6 +1063,8 @@
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodSetXY">TCPDF::SetXY()</a><br> Defines the abscissa and ordinate of the current position.</dd>
|
||||
<dt><b>SetY</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodSetY">TCPDF::SetY()</a><br> Moves the current abscissa back to the left margin and sets the ordinate.</dd>
|
||||
<dt><b>set_mqr</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodset_mqr">TCPDF::set_mqr()</a><br> Sets the current active configuration setting of magic_quotes_runtime (if the set_magic_quotes_runtime function exist)</dd>
|
||||
<dt><b>Skew</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodSkew">TCPDF::Skew()</a><br> Skew.</dd>
|
||||
<dt><b>SkewX</b></dt>
|
||||
@ -1374,7 +1378,7 @@
|
||||
<a href="elementindex.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 17:59:54 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -608,6 +608,8 @@
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGetX">TCPDF::GetX()</a><br> Returns the relative X value of current position.</dd>
|
||||
<dt><b>GetY</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGetY">TCPDF::GetY()</a><br> Returns the ordinate of the current position.</dd>
|
||||
<dt><b>get_mqr</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodget_mqr">TCPDF::get_mqr()</a><br> Gets the current active configuration setting of magic_quotes_runtime (if the get_magic_quotes_runtime function exist)</dd>
|
||||
<dt><b>Gradient</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodGradient">TCPDF::Gradient()</a><br> Output gradient.</dd>
|
||||
</dl>
|
||||
@ -1212,6 +1214,8 @@
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodSetXY">TCPDF::SetXY()</a><br> Defines the abscissa and ordinate of the current position.</dd>
|
||||
<dt><b>SetY</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodSetY">TCPDF::SetY()</a><br> Moves the current abscissa back to the left margin and sets the ordinate.</dd>
|
||||
<dt><b>set_mqr</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodset_mqr">TCPDF::set_mqr()</a><br> Sets the current active configuration setting of magic_quotes_runtime (if the set_magic_quotes_runtime function exist)</dd>
|
||||
<dt><b>Skew</b></dt>
|
||||
<dd>in file tcpdf.php, method <a href="com-tecnick-tcpdf/TCPDF.html#methodSkew">TCPDF::Skew()</a><br> Skew.</dd>
|
||||
<dt><b>SkewX</b></dt>
|
||||
@ -1397,7 +1401,7 @@
|
||||
<a href="elementindex_com-tecnick-tcpdf.html#top">top</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 17:59:53 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -35,7 +35,7 @@
|
||||
<a href="#Post-parsing">Post-parsing</a><br>
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:32 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 18:00:05 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 17:59:54 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -58,7 +58,7 @@
|
||||
This documentation was generated by <a href="http://www.phpdoc.org">phpDocumentor v1.4.1</a><br />
|
||||
<div class="credit">
|
||||
<hr />
|
||||
Documentation generated on Fri, 07 Aug 2009 14:13:25 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
Documentation generated on Mon, 17 Aug 2009 17:59:54 +0200 by <a href="http://www.phpdoc.org">phpDocumentor 1.4.1</a>
|
||||
</div>
|
||||
</td></tr></table>
|
||||
</td>
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
//============================================================+
|
||||
// File name : htmlcolors.php
|
||||
// Begin : 2002-04-09
|
||||
// Last Update : 2008-11-17
|
||||
// Last Update : 2009-08-17
|
||||
// Version : 1.0.002
|
||||
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
|
||||
// ----------------------------------------------------------------------------
|
||||
|
||||
45
tcpdf.php
45
tcpdf.php
@ -2,9 +2,9 @@
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2009-08-07
|
||||
// Last Update : 2009-08-17
|
||||
// Author : Nicola Asuni - info@tecnick.com - http://www.tcpdf.org
|
||||
// Version : 4.6.024
|
||||
// Version : 4.6.025
|
||||
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
|
||||
// ----------------------------------------------------------------------------
|
||||
// Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l.
|
||||
@ -126,7 +126,7 @@
|
||||
* @copyright 2002-2009 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 4.6.024
|
||||
* @version 4.6.025
|
||||
*/
|
||||
|
||||
/**
|
||||
@ -150,14 +150,14 @@ if (!class_exists('TCPDF', false)) {
|
||||
/**
|
||||
* define default PDF document producer
|
||||
*/
|
||||
define('PDF_PRODUCER', 'TCPDF 4.6.024 (http://www.tcpdf.org)');
|
||||
define('PDF_PRODUCER', 'TCPDF 4.6.025 (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 4.6.024
|
||||
* @version 4.6.025
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
* @link http://www.tcpdf.org
|
||||
* @license http://www.gnu.org/copyleft/lesser.html LGPL
|
||||
@ -4490,8 +4490,8 @@ if (!class_exists('TCPDF', false)) {
|
||||
if ($type == 'jpg') {
|
||||
$type = 'jpeg';
|
||||
}
|
||||
$mqr = get_magic_quotes_runtime();
|
||||
set_magic_quotes_runtime(0);
|
||||
$mqr = $this->get_mqr();
|
||||
$this->set_mqr(false);
|
||||
// Specific image handlers
|
||||
$mtd = '_parse'.$type;
|
||||
// GD image handler function
|
||||
@ -4537,7 +4537,7 @@ if (!class_exists('TCPDF', false)) {
|
||||
//If false, we cannot process image
|
||||
return;
|
||||
}
|
||||
set_magic_quotes_runtime($mqr);
|
||||
$this->set_mqr($mqr);
|
||||
if ($ismask) {
|
||||
// force grayscale
|
||||
$info['cs'] = 'DeviceGray';
|
||||
@ -4635,6 +4635,29 @@ if (!class_exists('TCPDF', false)) {
|
||||
return $info['i'];
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets the current active configuration setting of magic_quotes_runtime (if the set_magic_quotes_runtime function exist)
|
||||
* @param boolean $mqr FALSE for off, TRUE for on.
|
||||
* @since 4.6.025 (2009-08-17)
|
||||
*/
|
||||
public function set_mqr($mqr) {
|
||||
if (function_exists('set_magic_quotes_runtime')) {
|
||||
@set_magic_quotes_runtime($mqr);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Gets the current active configuration setting of magic_quotes_runtime (if the get_magic_quotes_runtime function exist)
|
||||
* @return Returns 0 if magic quotes runtime is off or get_magic_quotes_runtime doesn't exist, 1 otherwise.
|
||||
* @since 4.6.025 (2009-08-17)
|
||||
*/
|
||||
public function get_mqr() {
|
||||
if (function_exists('get_magic_quotes_runtime')) {
|
||||
return @get_magic_quotes_runtime();
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Convert the loaded php image to a JPEG and then return a structure for the PDF creator.
|
||||
* This function requires GD library and write access to the directory defined on K_PATH_CACHE constant.
|
||||
@ -5742,8 +5765,8 @@ if (!class_exists('TCPDF', false)) {
|
||||
$this->_out('<</Type /Encoding /BaseEncoding /WinAnsiEncoding /Differences ['.$diff.']>>');
|
||||
$this->_out('endobj');
|
||||
}
|
||||
$mqr = get_magic_quotes_runtime();
|
||||
set_magic_quotes_runtime(0);
|
||||
$mqr = $this->get_mqr();
|
||||
$this->set_mqr(false);
|
||||
foreach ($this->FontFiles as $file => $info) {
|
||||
// search and get font file to embedd
|
||||
$fontdir = $info['fontdir'];
|
||||
@ -5786,7 +5809,7 @@ if (!class_exists('TCPDF', false)) {
|
||||
$this->_out('endobj');
|
||||
}
|
||||
}
|
||||
set_magic_quotes_runtime($mqr);
|
||||
$this->set_mqr($mqr);
|
||||
foreach ($this->fontkeys as $k) {
|
||||
//Font objects
|
||||
$this->setFontSubBuffer($k, 'n', $this->n + 1);
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
//============================================================+
|
||||
// File name : unicode_data.php
|
||||
// Begin : 2008-01-01
|
||||
// Last Update : 2008-11-17
|
||||
// Last Update : 2009-08-17
|
||||
// License : GNU LGPL (http://www.gnu.org/copyleft/lesser.html)
|
||||
// ----------------------------------------------------------------------------
|
||||
// Copyright (C) 2002-2009 Nicola Asuni - Tecnick.com S.r.l.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user