joomla/tcpdf
32
1
Fork 0
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-22 12:55:10 +00:00
Code Issues Releases Activity

6.0.040 (2013-10-20)

Browse Source 
- Bug #849 "SVG import bug" was fixed.
- Bug #851 "Problem with images in PDF. PHP timing out" was fixed.
This commit is contained in:
nicolaasuni 2013-10-20 13:37:51 +01:00
parent 977539641b
commit 452f84276a
6 changed files with 81 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.TXT
View File

@ -1,3 +1,7 @@
6.0.040 (2013-10-20)
- Bug #849 "SVG import bug" was fixed.
- Bug #851 "Problem with images in PDF. PHP timing out" was fixed.
6.0.039 (2013-10-13) 6.0.039 (2013-10-13)
- Bug #843 "Wrong call in parser" was fixed. - Bug #843 "Wrong call in parser" was fixed.
- Bug #844 "Wrong object type named" was fixed. - Bug #844 "Wrong object type named" was fixed.

4
README.TXT
View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 6.0.039 Version: 6.0.040
Release date: 2013-10-13 Release date: 2013-10-20
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2013: Copyright (c) 2002-2013:

2
composer.json
View File

@ -1,6 +1,6 @@
{ {
"name": "tecnick.com/tcpdf", "name": "tecnick.com/tcpdf",
"version": "6.0.039", "version": "6.0.040",
"homepage": "http://www.tcpdf.org/", "homepage": "http://www.tcpdf.org/",
"type": "library", "type": "library",
"description": "TCPDF is a PHP class for generating PDF documents.", "description": "TCPDF is a PHP class for generating PDF documents.",

4
include/tcpdf_images.php
View File

@ -121,7 +121,7 @@ class TCPDF_IMAGES {
*/ */
public static function _toPNG($image) { public static function _toPNG($image) {
// set temporary image file name // set temporary image file name
$tempname = TCPDF_STATIC::getObjFilename('png'); $tempname = TCPDF_STATIC::getObjFilename('img');
// turn off interlaced mode // turn off interlaced mode
imageinterlace($image, 0); imageinterlace($image, 0);
// create temporary PNG image // create temporary PNG image
@ -144,7 +144,7 @@ class TCPDF_IMAGES {
* @public static * @public static
*/ */
public static function _toJPEG($image, $quality) { public static function _toJPEG($image, $quality) {
$tempname = TCPDF_STATIC::getObjFilename('jpg'); $tempname = TCPDF_STATIC::getObjFilename('img');
imagejpeg($image, $tempname, $quality); imagejpeg($image, $tempname, $quality);
imagedestroy($image); imagedestroy($image);
$retvars = self::_parsejpeg($tempname); $retvars = self::_parsejpeg($tempname);

8
include/tcpdf_static.php
View File

@ -55,7 +55,7 @@ class TCPDF_STATIC {
* Current TCPDF version. * Current TCPDF version.
* @private static * @private static
*/ */
private static $tcpdf_version = '6.0.039'; private static $tcpdf_version = '6.0.040';
/** /**
* String alias for total number of pages. * String alias for total number of pages.
@ -1092,13 +1092,13 @@ class TCPDF_STATIC {
/** /**
* Returns a temporary filename for caching object on filesystem. * Returns a temporary filename for caching object on filesystem.
* @param $name (string) Prefix to add to the file name. * @param $type (string) Type of file (name of the subdir on the tcpdf cache folder).
* @return string filename. * @return string filename.
* @since 4.5.000 (2008-12-31) * @since 4.5.000 (2008-12-31)
* @public static * @public static
*/ */
public static function getObjFilename($name) { public static function getObjFilename($type='tmp') {
return tempnam(K_PATH_CACHE, $name.'_'); return tempnam(K_PATH_CACHE, '__tcpdf_'.$type.'_'.md5(getmypid().uniqid('', true).rand().microtime(true)).'_');
} }
/** /**

89
tcpdf.php
View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 6.0.039 // Version : 6.0.040
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2013-10-13 // Last Update : 2013-10-20
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com // Author : Nicola Asuni - Tecnick.com LTD - 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)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -104,7 +104,7 @@
* Tools to encode your unicode fonts are on fonts/utils directory.</p> * Tools to encode your unicode fonts are on fonts/utils directory.</p>
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @author Nicola Asuni * @author Nicola Asuni
* @version 6.0.039 * @version 6.0.040
*/ */
// TCPDF configuration // TCPDF configuration
@ -128,7 +128,7 @@ require_once(dirname(__FILE__).'/include/tcpdf_static.php');
* TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br> * TCPDF project (http://www.tcpdf.org) has been originally derived in 2002 from the Public Domain FPDF class by Olivier Plathey (http://www.fpdf.org), but now is almost entirely rewritten.<br>
* @package com.tecnick.tcpdf * @package com.tecnick.tcpdf
* @brief PHP class for generating PDF documents without requiring external extensions. * @brief PHP class for generating PDF documents without requiring external extensions.
* @version 6.0.039 * @version 6.0.040
* @author Nicola Asuni - info@tecnick.com * @author Nicola Asuni - info@tecnick.com
*/ */
class TCPDF { class TCPDF {
@ -6080,7 +6080,7 @@ class TCPDF {
* @param $cellpadding (float) Internal cell padding, if empty uses default cell padding. * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0))) * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param. * @return float Return the minimal height needed for multicell method for printing the $txt param.
* @author Alexander Escalona Fernández, Nicola Asuni * @author Alexander Escalona Fern\E1ndez, Nicola Asuni
* @public * @public
* @since 4.5.011 * @since 4.5.011
*/ */
@ -6187,7 +6187,7 @@ class TCPDF {
* @param $cellpadding (float) Internal cell padding, if empty uses default cell padding. * @param $cellpadding (float) Internal cell padding, if empty uses default cell padding.
* @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0))) * @param $border (mixed) Indicates if borders must be drawn around the cell. The value can be a number:<ul><li>0: no border (default)</li><li>1: frame</li></ul> or a string containing some or all of the following characters (in any order):<ul><li>L: left</li><li>T: top</li><li>R: right</li><li>B: bottom</li></ul> or an array of line styles for each border group - for example: array('LTRB' => array('width' => 2, 'cap' => 'butt', 'join' => 'miter', 'dash' => 0, 'color' => array(0, 0, 0)))
* @return float Return the minimal height needed for multicell method for printing the $txt param. * @return float Return the minimal height needed for multicell method for printing the $txt param.
* @author Nicola Asuni, Alexander Escalona Fernández * @author Nicola Asuni, Alexander Escalona Fern\E1ndez
* @public * @public
*/ */
public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) { public function getStringHeight($w, $txt, $reseth=false, $autopadding=true, $cellpadding='', $border=0) {
@ -6803,6 +6803,7 @@ class TCPDF {
} }
if (isset($imgdata) AND ($imgdata !== FALSE)) { if (isset($imgdata) AND ($imgdata !== FALSE)) {
// copy image to cache // copy image to cache
$original_file = $file;
$file = TCPDF_STATIC::getObjFilename('img'); $file = TCPDF_STATIC::getObjFilename('img');
$fp = fopen($file, 'w'); $fp = fopen($file, 'w');
fwrite($fp, $imgdata); fwrite($fp, $imgdata);
@ -6811,6 +6812,7 @@ class TCPDF {
$imsize = @getimagesize($file); $imsize = @getimagesize($file);
if ($imsize === FALSE) { if ($imsize === FALSE) {
unlink($file); unlink($file);
$file = $original_file;
} else { } else {
$this->cached_files[] = $file; $this->cached_files[] = $file;
} }
@ -6822,7 +6824,7 @@ class TCPDF {
$ph = $this->getHTMLUnitToUnits($h, 0, $this->pdfunit, true) * $this->imgscale * $this->k; $ph = $this->getHTMLUnitToUnits($h, 0, $this->pdfunit, true) * $this->imgscale * $this->k;
$imsize = array($pw, $ph); $imsize = array($pw, $ph);
} else { } else {
$this->Error('[Image] Unable to get image: '.$file); $this->Error('[Image] Unable to get the size of the image: '.$file);
} }
} }
// file hash // file hash
@ -6923,10 +6925,12 @@ class TCPDF {
$newimage = true; $newimage = true;
} }
} }
} elseif (substr($file, 0, -34) != K_PATH_CACHE.'msk') { } elseif (($ismask === false) AND ($imgmask === false)) {
// check for cached images with alpha channel // check for cached images with alpha channel
$tempfile_plain = K_PATH_CACHE.'mskp_'.$filehash; // create temp image file (without alpha channel)
$tempfile_alpha = K_PATH_CACHE.'mska_'.$filehash; $tempfile_plain = K_PATH_CACHE.'__tcpdf_imgmask_plain_'.$filehash;
// create temp alpha file
$tempfile_alpha = K_PATH_CACHE.'__tcpdf_imgmask_alpha_'.$filehash;
if (in_array($tempfile_plain, $this->imagekeys)) { if (in_array($tempfile_plain, $this->imagekeys)) {
// get existing image data // get existing image data
$info = $this->getImageBuffer($tempfile_plain); $info = $this->getImageBuffer($tempfile_plain);
@ -6969,6 +6973,7 @@ class TCPDF {
try { try {
// GD library // GD library
$img = $gdfunction($file); $img = $gdfunction($file);
if ($img !== false) {
if ($resize) { if ($resize) {
$imgr = imagecreatetruecolor($neww, $newh); $imgr = imagecreatetruecolor($neww, $newh);
if (($type == 'gif') OR ($type == 'png')) { if (($type == 'gif') OR ($type == 'png')) {
@ -6987,6 +6992,7 @@ class TCPDF {
$info = TCPDF_IMAGES::_toJPEG($img, $this->jpeg_quality); $info = TCPDF_IMAGES::_toJPEG($img, $this->jpeg_quality);
} }
} }
}
} catch(Exception $e) { } catch(Exception $e) {
$info = false; $info = false;
} }
@ -7038,7 +7044,7 @@ class TCPDF {
} }
$img->setCompressionQuality($this->jpeg_quality); $img->setCompressionQuality($this->jpeg_quality);
$img->setImageFormat('jpeg'); $img->setImageFormat('jpeg');
$tempname = TCPDF_STATIC::getObjFilename('jpg'); $tempname = TCPDF_STATIC::getObjFilename('img');
$img->writeImage($tempname); $img->writeImage($tempname);
$info = TCPDF_IMAGES::_parsejpeg($tempname); $info = TCPDF_IMAGES::_parsejpeg($tempname);
unlink($tempname); unlink($tempname);
@ -7172,13 +7178,14 @@ class TCPDF {
* @see Image() * @see Image()
*/ */
protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $filehash='') { protected function ImagePngAlpha($file, $x, $y, $wpx, $hpx, $w, $h, $type, $link, $align, $resize, $dpi, $palign, $filehash='') {
// create temp images
if (empty($filehash)) { if (empty($filehash)) {
$filehash = md5($this->file_id.$file); $filehash = md5($this->file_id.$file);
} }
// create temp image file (without alpha channel) // create temp image file (without alpha channel)
$tempfile_plain = K_PATH_CACHE.'mskp_'.$filehash; $tempfile_plain = K_PATH_CACHE.'__tcpdf_imgmask_plain_'.$filehash;
// create temp alpha file // create temp alpha file
$tempfile_alpha = K_PATH_CACHE.'mska_'.$filehash; $tempfile_alpha = K_PATH_CACHE.'__tcpdf_imgmask_alpha_'.$filehash;
$parsed = false; $parsed = false;
$parse_error = ''; $parse_error = '';
// ImageMagick extension // ImageMagick extension
@ -7524,7 +7531,7 @@ class TCPDF {
$byterange .= str_repeat(' ', ($byterange_string_len - strlen($byterange))); $byterange .= str_repeat(' ', ($byterange_string_len - strlen($byterange)));
$pdfdoc = str_replace(TCPDF_STATIC::$byterange_string, $byterange, $pdfdoc); $pdfdoc = str_replace(TCPDF_STATIC::$byterange_string, $byterange, $pdfdoc);
// write the document to a temporary folder // write the document to a temporary folder
$tempdoc = TCPDF_STATIC::getObjFilename('tmppdf'); $tempdoc = TCPDF_STATIC::getObjFilename('doc');
$f = fopen($tempdoc, 'wb'); $f = fopen($tempdoc, 'wb');
if (!$f) { if (!$f) {
$this->Error('Unable to create temporary file: '.$tempdoc); $this->Error('Unable to create temporary file: '.$tempdoc);
@ -7533,7 +7540,7 @@ class TCPDF {
fwrite($f, $pdfdoc, $pdfdoc_length); fwrite($f, $pdfdoc, $pdfdoc_length);
fclose($f); fclose($f);
// get digital signature via openssl library // get digital signature via openssl library
$tempsign = TCPDF_STATIC::getObjFilename('tmpsig'); $tempsign = TCPDF_STATIC::getObjFilename('sig');
if (empty($this->signature_data['extracerts'])) { if (empty($this->signature_data['extracerts'])) {
openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED); openssl_pkcs7_sign($tempdoc, $tempsign, $this->signature_data['signcert'], array($this->signature_data['privkey'], $this->signature_data['password']), array(), PKCS7_BINARY | PKCS7_DETACHED);
} else { } else {
@ -10766,7 +10773,7 @@ class TCPDF {
// envelope data // envelope data
$envelope = $seed.$pkpermissions; $envelope = $seed.$pkpermissions;
// write the envelope data to a temporary file // write the envelope data to a temporary file
$tempkeyfile = TCPDF_STATIC::getObjFilename('tmpkey'); $tempkeyfile = TCPDF_STATIC::getObjFilename('key');
$f = fopen($tempkeyfile, 'wb'); $f = fopen($tempkeyfile, 'wb');
if (!$f) { if (!$f) {
$this->Error('Unable to create temporary key file: '.$tempkeyfile); $this->Error('Unable to create temporary key file: '.$tempkeyfile);
@ -10774,7 +10781,7 @@ class TCPDF {
$envelope_length = strlen($envelope); $envelope_length = strlen($envelope);
fwrite($f, $envelope, $envelope_length); fwrite($f, $envelope, $envelope_length);
fclose($f); fclose($f);
$tempencfile = TCPDF_STATIC::getObjFilename('tmpenc'); $tempencfile = TCPDF_STATIC::getObjFilename('enc');
if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_BINARY | PKCS7_DETACHED)) { if (!openssl_pkcs7_encrypt($tempkeyfile, $tempencfile, $pubkey['c'], array(), PKCS7_BINARY | PKCS7_DETACHED)) {
$this->Error('Unable to encrypt the file: '.$tempkeyfile); $this->Error('Unable to encrypt the file: '.$tempkeyfile);
} }
@ -11398,7 +11405,7 @@ class TCPDF {
} }
/** /**
* Append a cubic Bézier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the Bézier control points. * Append a cubic B\E9zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x2, y2) as the B\E9zier control points.
* The new current point shall be (x3, y3). * The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1. * @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate of control point 1. * @param $y1 (float) Ordinate of control point 1.
@ -11416,7 +11423,7 @@ class TCPDF {
} }
/** /**
* Append a cubic Bézier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the Bézier control points. * Append a cubic B\E9zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using the current point and (x2, y2) as the B\E9zier control points.
* The new current point shall be (x3, y3). * The new current point shall be (x3, y3).
* @param $x2 (float) Abscissa of control point 2. * @param $x2 (float) Abscissa of control point 2.
* @param $y2 (float) Ordinate of control point 2. * @param $y2 (float) Ordinate of control point 2.
@ -11432,7 +11439,7 @@ class TCPDF {
} }
/** /**
* Append a cubic Bézier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the Bézier control points. * Append a cubic B\E9zier curve to the current path. The curve shall extend from the current point to the point (x3, y3), using (x1, y1) and (x3, y3) as the B\E9zier control points.
* The new current point shall be (x3, y3). * The new current point shall be (x3, y3).
* @param $x1 (float) Abscissa of control point 1. * @param $x1 (float) Abscissa of control point 1.
* @param $y1 (float) Ordinate of control point 1. * @param $y1 (float) Ordinate of control point 1.
@ -12227,7 +12234,7 @@ class TCPDF {
/** /**
* Insert Named Destinations. * Insert Named Destinations.
* @protected * @protected
* @author Johannes Güntert, Nicola Asuni * @author Johannes G\FCntert, Nicola Asuni
* @since 5.9.098 (2011-06-23) * @since 5.9.098 (2011-06-23)
*/ */
protected function _putdests() { protected function _putdests() {
@ -12455,7 +12462,7 @@ class TCPDF {
* Adds a javascript * Adds a javascript
* @param $script (string) Javascript code * @param $script (string) Javascript code
* @public * @public
* @author Johannes Güntert, Nicola Asuni * @author Johannes G\FCntert, Nicola Asuni
* @since 2.1.002 (2008-02-12) * @since 2.1.002 (2008-02-12)
*/ */
public function IncludeJS($script) { public function IncludeJS($script) {
@ -12484,7 +12491,7 @@ class TCPDF {
/** /**
* Create a javascript PDF string. * Create a javascript PDF string.
* @protected * @protected
* @author Johannes Güntert, Nicola Asuni * @author Johannes G\FCntert, Nicola Asuni
* @since 2.1.002 (2008-02-12) * @since 2.1.002 (2008-02-12)
*/ */
protected function _putjavascript() { protected function _putjavascript() {
@ -14216,7 +14223,7 @@ class TCPDF {
* @param $col1 (array) first color (Grayscale, RGB or CMYK components). * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
* @param $col2 (array) second color (Grayscale, RGB or CMYK components). * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
* @param $coords (array) array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0). * @param $coords (array) array of the form (x1, y1, x2, y2) which defines the gradient vector (see linear_gradient_coords.jpg). The default value is from left to right (x1=0, y1=0, x2=1, y2=0).
* @author Andreas Würmser, Nicola Asuni * @author Andreas W\FCrmser, Nicola Asuni
* @since 3.1.000 (2008-06-09) * @since 3.1.000 (2008-06-09)
* @public * @public
*/ */
@ -14234,7 +14241,7 @@ class TCPDF {
* @param $col1 (array) first color (Grayscale, RGB or CMYK components). * @param $col1 (array) first color (Grayscale, RGB or CMYK components).
* @param $col2 (array) second color (Grayscale, RGB or CMYK components). * @param $col2 (array) second color (Grayscale, RGB or CMYK components).
* @param $coords (array) array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined. * @param $coords (array) array of the form (fx, fy, cx, cy, r) where (fx, fy) is the starting point of the gradient with color1, (cx, cy) is the center of the circle with color2, and r is the radius of the circle (see radial_gradient_coords.jpg). (fx, fy) should be inside the circle, otherwise some areas will not be defined.
* @author Andreas Würmser, Nicola Asuni * @author Andreas W\FCrmser, Nicola Asuni
* @since 3.1.000 (2008-06-09) * @since 3.1.000 (2008-06-09)
* @public * @public
*/ */
@ -14257,7 +14264,7 @@ class TCPDF {
* @param $coords_min (array) minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0 * @param $coords_min (array) minimum value used by the coordinates. If a coordinate's value is smaller than this it will be cut to coords_min. default: 0
* @param $coords_max (array) maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1 * @param $coords_max (array) maximum value used by the coordinates. If a coordinate's value is greater than this it will be cut to coords_max. default: 1
* @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts. * @param $antialias (boolean) A flag indicating whether to filter the shading function to prevent aliasing artifacts.
* @author Andreas Würmser, Nicola Asuni * @author Andreas W\FCrmser, Nicola Asuni
* @since 3.1.000 (2008-06-09) * @since 3.1.000 (2008-06-09)
* @public * @public
*/ */
@ -14349,7 +14356,7 @@ class TCPDF {
* @param $y (float) ordinate of the top left corner of the rectangle. * @param $y (float) ordinate of the top left corner of the rectangle.
* @param $w (float) width of the rectangle. * @param $w (float) width of the rectangle.
* @param $h (float) height of the rectangle. * @param $h (float) height of the rectangle.
* @author Andreas Würmser, Nicola Asuni * @author Andreas W\FCrmser, Nicola Asuni
* @since 3.1.000 (2008-06-09) * @since 3.1.000 (2008-06-09)
* @protected * @protected
*/ */
@ -20494,7 +20501,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$this->bufferlen += strlen($data); $this->bufferlen += strlen($data);
if ($this->diskcache) { if ($this->diskcache) {
if (!isset($this->buffer) OR TCPDF_STATIC::empty_string($this->buffer)) { if (!isset($this->buffer) OR TCPDF_STATIC::empty_string($this->buffer)) {
$this->buffer = TCPDF_STATIC::getObjFilename('buffer'); $this->buffer = TCPDF_STATIC::getObjFilename('buf');
} }
$this->writeDiskCache($this->buffer, $data, true); $this->writeDiskCache($this->buffer, $data, true);
} else { } else {
@ -20512,7 +20519,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
$this->bufferlen = strlen($data); $this->bufferlen = strlen($data);
if ($this->diskcache) { if ($this->diskcache) {
if (!isset($this->buffer) OR TCPDF_STATIC::empty_string($this->buffer)) { if (!isset($this->buffer) OR TCPDF_STATIC::empty_string($this->buffer)) {
$this->buffer = TCPDF_STATIC::getObjFilename('buffer'); $this->buffer = TCPDF_STATIC::getObjFilename('buf');
} }
$this->writeDiskCache($this->buffer, $data, false); $this->writeDiskCache($this->buffer, $data, false);
} else { } else {
@ -20545,7 +20552,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
protected function setPageBuffer($page, $data, $append=false) { protected function setPageBuffer($page, $data, $append=false) {
if ($this->diskcache) { if ($this->diskcache) {
if (!isset($this->pages[$page])) { if (!isset($this->pages[$page])) {
$this->pages[$page] = TCPDF_STATIC::getObjFilename('page'.$page); $this->pages[$page] = TCPDF_STATIC::getObjFilename('page');
} }
$this->writeDiskCache($this->pages[$page], $data, $append); $this->writeDiskCache($this->pages[$page], $data, $append);
} else { } else {
@ -20594,7 +20601,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} }
if ($this->diskcache) { if ($this->diskcache) {
if (!isset($this->images[$image])) { if (!isset($this->images[$image])) {
$this->images[$image] = TCPDF_STATIC::getObjFilename('image'.$image); $this->images[$image] = TCPDF_STATIC::getObjFilename('img');
} }
$this->writeDiskCache($this->images[$image], serialize($data)); $this->writeDiskCache($this->images[$image], serialize($data));
} else { } else {
@ -23338,7 +23345,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} }
break; break;
} }
case 'Q': { // quadratic Bézier curveto case 'Q': { // quadratic B\E9zier curveto
foreach ($params as $ck => $cp) { foreach ($params as $ck => $cp) {
$params[$ck] = $cp; $params[$ck] = $cp;
if ((($ck + 1) % 4) == 0) { if ((($ck + 1) % 4) == 0) {
@ -23364,7 +23371,7 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
} }
break; break;
} }
case 'T': { // shorthand/smooth quadratic Bézier curveto case 'T': { // shorthand/smooth quadratic B\E9zier curveto
foreach ($params as $ck => $cp) { foreach ($params as $ck => $cp) {
$params[$ck] = $cp; $params[$ck] = $cp;
if (($ck % 2) != 0) { if (($ck % 2) != 0) {
@ -23567,7 +23574,6 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
if (!empty($ctm)) { if (!empty($ctm)) {
$tm = $ctm; $tm = $ctm;
} else { } else {
//$tm = $this->svgstyles[(count($this->svgstyles) - 1)]['transfmatrix'];
$tm = array(1,0,0,1,0,0); $tm = array(1,0,0,1,0,0);
} }
if (isset($attribs['transform']) AND !empty($attribs['transform'])) { if (isset($attribs['transform']) AND !empty($attribs['transform'])) {
@ -23713,13 +23719,18 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
if (isset($attribs['d'])) { if (isset($attribs['d'])) {
$d = trim($attribs['d']); $d = trim($attribs['d']);
if (!empty($d)) { if (!empty($d)) {
$x = (isset($attribs['x'])?$attribs['x']:0);
$y = (isset($attribs['y'])?$attribs['y']:0);
$w = (isset($attribs['width'])?$attribs['width']:1);
$h = (isset($attribs['height'])?$attribs['height']:1);
$tm = TCPDF_STATIC::getTransformationMatrixProduct($tm, array($w, 0, 0, $h, $x, $y));
if ($clipping) { if ($clipping) {
$this->SVGTransform($tm); $this->SVGTransform($tm);
$this->SVGPath($d, 'CNZ'); $this->SVGPath($d, 'CNZ');
} else { } else {
$this->StartTransform(); $this->StartTransform();
$this->SVGTransform($tm); $this->SVGTransform($tm);
$obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, 0, 0, 1, 1, 'SVGPath', array($d, 'CNZ')); $obstyle = $this->setSVGStyles($svgstyle, $prev_svgstyle, $x, $y, $w, $h, 'SVGPath', array($d, 'CNZ'));
if (!empty($obstyle)) { if (!empty($obstyle)) {
$this->SVGPath($d, $obstyle); $this->SVGPath($d, $obstyle);
} }
@ -24008,7 +24019,13 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
if (isset($attribs['id'])) { if (isset($attribs['id'])) {
unset($attribs['id']); unset($attribs['id']);
} }
$attribs = array_merge($attribs, $use['attribs']); if (isset($use['attribs']['x']) AND isset($attribs['x'])) {
$attribs['x'] += $use['attribs']['x'];
}
if (isset($use['attribs']['y']) AND isset($attribs['y'])) {
$attribs['y'] += $use['attribs']['y'];
}
$attribs = array_merge($use['attribs'], $attribs);
$this->startSVGElementHandler($parser, $use['name'], $attribs); $this->startSVGElementHandler($parser, $use['name'], $attribs);
} }
} }