32
1
mirror of https://github.com/vdm-io/tcpdf.git synced 2024-11-28 23:26:26 +00:00

6.0.049 (2013-11-27)

- A bug related to PNG images was fixed.
This commit is contained in:
nicolaasuni 2013-11-27 20:18:34 +00:00
parent b9c8ff7302
commit 3cd2637a80
5 changed files with 10 additions and 7 deletions

View File

@ -1,3 +1,6 @@
6.0.049 (2013-11-27)
- A bug related to PNG images was fixed.
6.0.048 (2013-11-24) 6.0.048 (2013-11-24)
- SVG vars are now reset in ImageSVG() method. - SVG vars are now reset in ImageSVG() method.

View File

@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
------------------------------------------------------------ ------------------------------------------------------------
Name: TCPDF Name: TCPDF
Version: 6.0.048 Version: 6.0.049
Release date: 2013-11-24 Release date: 2013-11-27
Author: Nicola Asuni Author: Nicola Asuni
Copyright (c) 2002-2013: Copyright (c) 2002-2013:

View File

@ -1,6 +1,6 @@
{ {
"name": "tecnick.com/tcpdf", "name": "tecnick.com/tcpdf",
"version": "6.0.048", "version": "6.0.049",
"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.",

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.048'; private static $tcpdf_version = '6.0.049';
/** /**
* String alias for total number of pages. * String alias for total number of pages.

View File

@ -1,9 +1,9 @@
<?php <?php
//============================================================+ //============================================================+
// File name : tcpdf.php // File name : tcpdf.php
// Version : 6.0.048 // Version : 6.0.049
// Begin : 2002-08-03 // Begin : 2002-08-03
// Last Update : 2013-11-24 // Last Update : 2013-11-27
// 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)
// ------------------------------------------------------------------- // -------------------------------------------------------------------
@ -6918,7 +6918,7 @@ class TCPDF {
$newimage = false; $newimage = false;
// get existing image data // get existing image data
$info = $this->getImageBuffer($file); $info = $this->getImageBuffer($file);
if (substr($file, 0, -34) != K_PATH_CACHE.'msk') { if (strpos($file, '__tcpdf_imgmask_') === FALSE) {
// check if the newer image is larger // check if the newer image is larger
$oldsize = ($info['w'] * $info['h']); $oldsize = ($info['w'] * $info['h']);
if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) { if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) {