From 3cd2637a803d9ff9ca9bb0c178d688eb43b44e0b Mon Sep 17 00:00:00 2001
From: nicolaasuni <info@tecnick.com>
Date: Wed, 27 Nov 2013 20:18:34 +0000
Subject: [PATCH] 6.0.049 (2013-11-27) - A bug related to PNG images was fixed.

---
 CHANGELOG.TXT            | 3 +++
 README.TXT               | 4 ++--
 composer.json            | 2 +-
 include/tcpdf_static.php | 2 +-
 tcpdf.php                | 6 +++---
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.TXT b/CHANGELOG.TXT
index a6a4441..5bbc52f 100644
--- a/CHANGELOG.TXT
+++ b/CHANGELOG.TXT
@@ -1,3 +1,6 @@
+6.0.049 (2013-11-27)
+	- A bug related to PNG images was fixed.
+
 6.0.048 (2013-11-24)
 	- SVG vars are now reset in ImageSVG() method.
 
diff --git a/README.TXT b/README.TXT
index cf4cc21..7791f64 100644
--- a/README.TXT
+++ b/README.TXT
@@ -8,8 +8,8 @@ http://sourceforge.net/donate/index.php?group_id=128076
 ------------------------------------------------------------
 
 Name: TCPDF
-Version: 6.0.048
-Release date: 2013-11-24
+Version: 6.0.049
+Release date: 2013-11-27
 Author:	Nicola Asuni
 
 Copyright (c) 2002-2013:
diff --git a/composer.json b/composer.json
index 99d8844..58b874e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"name": "tecnick.com/tcpdf",
-	"version": "6.0.048",
+	"version": "6.0.049",
 	"homepage": "http://www.tcpdf.org/",
 	"type": "library",
 	"description": "TCPDF is a PHP class for generating PDF documents.",
diff --git a/include/tcpdf_static.php b/include/tcpdf_static.php
index 4b6e430..4959986 100644
--- a/include/tcpdf_static.php
+++ b/include/tcpdf_static.php
@@ -55,7 +55,7 @@ class TCPDF_STATIC {
 	 * Current TCPDF version.
 	 * @private static
 	 */
-	private static $tcpdf_version = '6.0.048';
+	private static $tcpdf_version = '6.0.049';
 
 	/**
 	 * String alias for total number of pages.
diff --git a/tcpdf.php b/tcpdf.php
index 53eca68..361714a 100644
--- a/tcpdf.php
+++ b/tcpdf.php
@@ -1,9 +1,9 @@
 <?php
 //============================================================+
 // File name   : tcpdf.php
-// Version     : 6.0.048
+// Version     : 6.0.049
 // 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
 // License     : GNU-LGPL v3 (http://www.gnu.org/copyleft/lesser.html)
 // -------------------------------------------------------------------
@@ -6918,7 +6918,7 @@ class TCPDF {
 			$newimage = false;
 			// get existing image data
 			$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
 				$oldsize = ($info['w'] * $info['h']);
 				if ((($oldsize < $newsize) AND ($resize)) OR (($oldsize < $pixsize) AND (!$resize))) {