From 300e9e7e71bb9a3e095dca425e944e2fbf6e5117 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Tue, 31 Mar 2015 05:20:00 +0200
Subject: [PATCH] fix some png images being discarded

---
 inc/image.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/inc/image.php b/inc/image.php
index 7a68605d..291f3e2a 100644
--- a/inc/image.php
+++ b/inc/image.php
@@ -363,9 +363,10 @@ class ImageConvert extends ImageBase {
 					$this->height,
 					escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
 
-					if (strpos($error, "known incorrect sRGB profile") === false) {
+					if (strpos($error, "known incorrect sRGB profile") === false &&
+                                            strpos($error, "iCCP: Not recognizing known sRGB profile that has been edited") === false) {
 						$this->destroy();
-						error('Failed to resize image!', null, array('convert_error' => $error));
+						error(_('Failed to resize image!')." "._('Details: ').nl2br(htmlspecialchars($error)), null, array('convert_error' => $error));
 					}
 					if (!file_exists($this->temp)) {
 						$this->destroy();