mirror of
https://github.com/vdm-io/tcpdf.git
synced 2024-11-25 22:07:33 +00:00
6.0.082 (2014-05-23)
- Bug item #926 "test statement instead of assignment used in tcpdf_fonts.php" was fixed. - Bug item #925 "924 transparent images bug" was fixed.
This commit is contained in:
nicolaasuni
parent
e885862b73
commit
23ce7ff380
@ -1,3 +1,7 @@
|
||||
6.0.082 (2014-05-23)
|
||||
- Bug item #926 "test statement instead of assignment used in tcpdf_fonts.php" was fixed.
|
||||
- Bug item #925 "924 transparent images bug" was fixed.
|
||||
|
||||
6.0.081 (2014-05-22)
|
||||
- Bug item #922 "writehtml tables thead repeating" was fixed.
|
||||
- Patch #71 "External and internal links, local and remote" wa applied.
|
||||
|
||||
@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
|
||||
------------------------------------------------------------
|
||||
|
||||
Name: TCPDF
|
||||
Version: 6.0.081
|
||||
Release date: 2014-05-22
|
||||
Version: 6.0.082
|
||||
Release date: 2014-05-23
|
||||
Author: Nicola Asuni
|
||||
|
||||
Copyright (c) 2002-2014:
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "tecnick.com/tcpdf",
|
||||
"version": "6.0.081",
|
||||
"version": "6.0.082",
|
||||
"homepage": "http://www.tcpdf.org/",
|
||||
"type": "library",
|
||||
"description": "TCPDF is a PHP class for generating PDF documents.",
|
||||
|
||||
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf_fonts.php
|
||||
// Version : 1.0.012
|
||||
// Version : 1.0.013
|
||||
// Begin : 2008-01-01
|
||||
// Last Update : 2014-05-12
|
||||
// Last Update : 2014-05-23
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// License : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
|
||||
// -------------------------------------------------------------------
|
||||
@ -42,7 +42,7 @@
|
||||
* @class TCPDF_FONTS
|
||||
* Font methods for TCPDF library.
|
||||
* @package com.tecnick.tcpdf
|
||||
* @version 1.0.012
|
||||
* @version 1.0.013
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF_FONTS {
|
||||
@ -810,7 +810,7 @@ class TCPDF_FONTS {
|
||||
}
|
||||
} // end of true type
|
||||
if (($fmetric['type'] == 'TrueTypeUnicode') AND (count($ctg) == 256)) {
|
||||
$fmetric['type'] == 'TrueType';
|
||||
$fmetric['type'] = 'TrueType';
|
||||
}
|
||||
// ---------- create php font file ----------
|
||||
$pfile = '<'.'?'.'php'."\n";
|
||||
|
||||
@ -319,11 +319,9 @@ class TCPDF_IMAGES {
|
||||
} elseif ($type == 'iCCP') {
|
||||
// skip profile name
|
||||
$len = 0;
|
||||
while ((ord(fread($f, 1)) > 0) AND ($len < 80)) {
|
||||
while ((ord(fread($f, 1)) != 0) AND ($len < 79)) {
|
||||
++$len;
|
||||
}
|
||||
// skip null separator
|
||||
fread($f, 1);
|
||||
// get compression method
|
||||
if (ord(fread($f, 1)) != 0) {
|
||||
// Unknown filter method
|
||||
|
||||
@ -55,7 +55,7 @@ class TCPDF_STATIC {
|
||||
* Current TCPDF version.
|
||||
* @private static
|
||||
*/
|
||||
private static $tcpdf_version = '6.0.081';
|
||||
private static $tcpdf_version = '6.0.082';
|
||||
|
||||
/**
|
||||
* String alias for total number of pages.
|
||||
|
||||
28
tcpdf.php
28
tcpdf.php
@ -1,9 +1,9 @@
|
||||
<?php
|
||||
//============================================================+
|
||||
// File name : tcpdf.php
|
||||
// Version : 6.0.081
|
||||
// Version : 6.0.082
|
||||
// Begin : 2002-08-03
|
||||
// Last Update : 2014-05-22
|
||||
// Last Update : 2014-05-23
|
||||
// Author : Nicola Asuni - Tecnick.com LTD - www.tecnick.com - info@tecnick.com
|
||||
// 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>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @author Nicola Asuni
|
||||
* @version 6.0.081
|
||||
* @version 6.0.082
|
||||
*/
|
||||
|
||||
// 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>
|
||||
* @package com.tecnick.tcpdf
|
||||
* @brief PHP class for generating PDF documents without requiring external extensions.
|
||||
* @version 6.0.081
|
||||
* @version 6.0.082
|
||||
* @author Nicola Asuni - info@tecnick.com
|
||||
*/
|
||||
class TCPDF {
|
||||
@ -9191,11 +9191,31 @@ class TCPDF {
|
||||
if (isset($info['trns']) AND is_array($info['trns'])) {
|
||||
$trns = '';
|
||||
$count_info = count($info['trns']);
|
||||
if ($info['cs'] == 'Indexed') {
|
||||
$maxval =(pow(2, $info['bpc']) - 1);
|
||||
for ($i = 0; $i < $count_info; ++$i) {
|
||||
if (($info['trns'][$i] != 0) AND ($info['trns'][$i] != $maxval)) {
|
||||
// this is not a binary type mask @TODO: create a SMask
|
||||
$trns = '';
|
||||
break;
|
||||
} elseif (empty($trns) AND ($info['trns'][$i] == 0)) {
|
||||
// store the first fully transparent value
|
||||
$trns .= $i.' '.$i.' ';
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// grayscale or RGB
|
||||
for ($i = 0; $i < $count_info; ++$i) {
|
||||
if ($info['trns'][$i] == 0) {
|
||||
$trns .= $info['trns'][$i].' '.$info['trns'][$i].' ';
|
||||
}
|
||||
}
|
||||
}
|
||||
// Colour Key Masking
|
||||
if (!empty($trns)) {
|
||||
$out .= ' /Mask ['.$trns.']';
|
||||
}
|
||||
}
|
||||
$stream = $this->_getrawstream($info['data']);
|
||||
$out .= ' /Length '.strlen($stream).' >>';
|
||||
$out .= ' stream'."\n".$stream."\n".'endstream';
|
||||
|
||||
Loading…
Reference in New Issue
Block a user