From 9a5f3b2e31a00d13a8ae5320720d8a26976debc0 Mon Sep 17 00:00:00 2001
From: czaks <marcin@6irc.net>
Date: Sat, 4 Jan 2014 19:09:30 +0100
Subject: [PATCH] image resizing: fix a problem with some pngs; reported by
 urban

---
 inc/image.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/inc/image.php b/inc/image.php
index 1d591c25..9bb44414 100644
--- a/inc/image.php
+++ b/inc/image.php
@@ -338,8 +338,10 @@ class ImageConvert extends ImageBase {
 						$this->width,
 						$this->height,
 						escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
-					$this->destroy();
-					error('Failed to resize image!', null, $error);
+					if (!preg_match ('/sBIT: invalid/', $error)) {
+						$this->destroy();
+						error('Failed to resize image!', null, $error);
+					}
 				}
 				if ($size = $this->get_size($this->temp)) {
 					$this->width = $size[0];
@@ -361,8 +363,10 @@ class ImageConvert extends ImageBase {
 					$this->width,
 					$this->height,
 					escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
-				$this->destroy();
-				error('Failed to resize image!', null, $error);
+                                if (!preg_match ('/sBIT: invalid/', $error)) {
+					$this->destroy();
+					error('Failed to resize image!', null, $error);
+				}
 			}
 			if ($size = $this->get_size($this->temp)) {
 				$this->width = $size[0];