mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-25 13:57:33 +00:00
6.0.063 (2014-04-03)
- Method TCPDF_IMAGES::_parsepng() was fixed to support transparency in Indexed images.
This commit is contained in:
parent
cada5f0ef8
commit
d24b4d4a07
@ -1,3 +1,6 @@
|
|||||||
|
6.0.063 (2014-04-03)
|
||||||
|
- Method TCPDF_IMAGES::_parsepng() was fixed to support transparency in Indexed images.
|
||||||
|
|
||||||
6.0.062 (2014-03-02)
|
6.0.062 (2014-03-02)
|
||||||
- The method startLayer() now accepts the NULL value for the $print parameter to not set the print layer option.
|
- The method startLayer() now accepts the NULL value for the $print parameter to not set the print layer option.
|
||||||
|
|
||||||
|
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
|||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
|
|
||||||
Name: TCPDF
|
Name: TCPDF
|
||||||
Version: 6.0.062
|
Version: 6.0.063
|
||||||
Release date: 2014-03-02
|
Release date: 2014-04-03
|
||||||
Author: Nicola Asuni
|
Author: Nicola Asuni
|
||||||
|
|
||||||
Copyright (c) 2002-2014:
|
Copyright (c) 2002-2014:
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tecnick.com/tcpdf",
|
"name": "tecnick.com/tcpdf",
|
||||||
"version": "6.0.062",
|
"version": "6.0.063",
|
||||||
"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.",
|
||||||
|
@ -1,13 +1,13 @@
|
|||||||
<?php
|
<?php
|
||||||
//============================================================+
|
//============================================================+
|
||||||
// File name : tcpdf_images.php
|
// File name : tcpdf_images.php
|
||||||
// Version : 1.0.002
|
// Version : 1.0.003
|
||||||
// Begin : 2002-08-03
|
// Begin : 2002-08-03
|
||||||
// Last Update : 2013-11-24
|
// Last Update : 2014-04-03
|
||||||
// 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)
|
||||||
// -------------------------------------------------------------------
|
// -------------------------------------------------------------------
|
||||||
// Copyright (C) 2002-2013 Nicola Asuni - Tecnick.com LTD
|
// Copyright (C) 2002-2014 Nicola Asuni - Tecnick.com LTD
|
||||||
//
|
//
|
||||||
// This file is part of TCPDF software library.
|
// This file is part of TCPDF software library.
|
||||||
//
|
//
|
||||||
@ -38,7 +38,7 @@
|
|||||||
* This is a PHP class that contains static image methods for the TCPDF class.<br>
|
* This is a PHP class that contains static image methods for the TCPDF class.<br>
|
||||||
* @package com.tecnick.tcpdf
|
* @package com.tecnick.tcpdf
|
||||||
* @author Nicola Asuni
|
* @author Nicola Asuni
|
||||||
* @version 1.0.002
|
* @version 1.0.003
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -46,7 +46,7 @@
|
|||||||
* Static image methods used by the TCPDF class.
|
* Static image methods used by the TCPDF class.
|
||||||
* @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 1.0.002
|
* @version 1.0.003
|
||||||
* @author Nicola Asuni - info@tecnick.com
|
* @author Nicola Asuni - info@tecnick.com
|
||||||
*/
|
*/
|
||||||
class TCPDF_IMAGES {
|
class TCPDF_IMAGES {
|
||||||
@ -299,14 +299,16 @@ class TCPDF_IMAGES {
|
|||||||
} elseif ($type == 'tRNS') {
|
} elseif ($type == 'tRNS') {
|
||||||
// read transparency info
|
// read transparency info
|
||||||
$t = TCPDF_STATIC::rfread($f, $n);
|
$t = TCPDF_STATIC::rfread($f, $n);
|
||||||
if ($ct == 0) {
|
if ($ct == 0) { // DeviceGray
|
||||||
$trns = array(ord($t{1}));
|
$trns = array(ord($t{1}));
|
||||||
} elseif ($ct == 2) {
|
} elseif ($ct == 2) { // DeviceRGB
|
||||||
$trns = array(ord($t{1}), ord($t{3}), ord($t{5}));
|
$trns = array(ord($t{1}), ord($t{3}), ord($t{5}));
|
||||||
} else {
|
} else { // Indexed
|
||||||
$pos = strpos($t, chr(0));
|
if ($n > 0) {
|
||||||
if ($pos !== false) {
|
$trns = array();
|
||||||
$trns = array($pos);
|
for ($i = 0; $i < $n; ++ $i) {
|
||||||
|
$trns[] = ord($t{$i});
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
fread($f, 4);
|
fread($f, 4);
|
||||||
|
@ -55,7 +55,7 @@ class TCPDF_STATIC {
|
|||||||
* Current TCPDF version.
|
* Current TCPDF version.
|
||||||
* @private static
|
* @private static
|
||||||
*/
|
*/
|
||||||
private static $tcpdf_version = '6.0.062';
|
private static $tcpdf_version = '6.0.063';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* String alias for total number of pages.
|
* String alias for total number of pages.
|
||||||
|
20
tcpdf.php
20
tcpdf.php
@ -1,9 +1,9 @@
|
|||||||
<?php
|
<?php
|
||||||
//============================================================+
|
//============================================================+
|
||||||
// File name : tcpdf.php
|
// File name : tcpdf.php
|
||||||
// Version : 6.0.061
|
// Version : 6.0.063
|
||||||
// Begin : 2002-08-03
|
// Begin : 2002-08-03
|
||||||
// Last Update : 2014-02-18
|
// Last Update : 2014-04-03
|
||||||
// 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.061
|
* @version 6.0.063
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// 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.061
|
* @version 6.0.063
|
||||||
* @author Nicola Asuni - info@tecnick.com
|
* @author Nicola Asuni - info@tecnick.com
|
||||||
*/
|
*/
|
||||||
class TCPDF {
|
class TCPDF {
|
||||||
@ -10309,7 +10309,7 @@ class TCPDF {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Set header font.
|
* Set header font.
|
||||||
* @param $font (array) font
|
* @param $font (array) Array describing the basic font parameters: (family, style, size).
|
||||||
* @public
|
* @public
|
||||||
* @since 1.1
|
* @since 1.1
|
||||||
*/
|
*/
|
||||||
@ -10319,7 +10319,7 @@ class TCPDF {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get header font.
|
* Get header font.
|
||||||
* @return array()
|
* @return array() Array describing the basic font parameters: (family, style, size).
|
||||||
* @public
|
* @public
|
||||||
* @since 4.0.012 (2008-07-24)
|
* @since 4.0.012 (2008-07-24)
|
||||||
*/
|
*/
|
||||||
@ -10329,7 +10329,7 @@ class TCPDF {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Set footer font.
|
* Set footer font.
|
||||||
* @param $font (array) font
|
* @param $font (array) Array describing the basic font parameters: (family, style, size).
|
||||||
* @public
|
* @public
|
||||||
* @since 1.1
|
* @since 1.1
|
||||||
*/
|
*/
|
||||||
@ -10339,7 +10339,7 @@ class TCPDF {
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Get Footer font.
|
* Get Footer font.
|
||||||
* @return array()
|
* @return array() Array describing the basic font parameters: (family, style, size).
|
||||||
* @public
|
* @public
|
||||||
* @since 4.0.012 (2008-07-24)
|
* @since 4.0.012 (2008-07-24)
|
||||||
*/
|
*/
|
||||||
@ -23726,8 +23726,8 @@ Putting 1 is equivalent to putting 0 and calling Ln() just after. Default value:
|
|||||||
$this->StartTransform();
|
$this->StartTransform();
|
||||||
$x = (isset($attribs['x'])?$attribs['x']:0);
|
$x = (isset($attribs['x'])?$attribs['x']:0);
|
||||||
$y = (isset($attribs['y'])?$attribs['y']:0);
|
$y = (isset($attribs['y'])?$attribs['y']:0);
|
||||||
$w = (isset($attribs['width'])?$attribs['width']:1);
|
$w = 1;//(isset($attribs['width'])?$attribs['width']:1);
|
||||||
$h = (isset($attribs['height'])?$attribs['height']:1);
|
$h = 1;//(isset($attribs['height'])?$attribs['height']:1);
|
||||||
$tm = TCPDF_STATIC::getTransformationMatrixProduct($tm, array($w, 0, 0, $h, $x, $y));
|
$tm = TCPDF_STATIC::getTransformationMatrixProduct($tm, array($w, 0, 0, $h, $x, $y));
|
||||||
$this->SVGTransform($tm);
|
$this->SVGTransform($tm);
|
||||||
$this->setSVGStyles($svgstyle, $prev_svgstyle);
|
$this->setSVGStyles($svgstyle, $prev_svgstyle);
|
||||||
|
Loading…
Reference in New Issue
Block a user