summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2014-02-22 15:47:29 +0100
committerczaks <marcin@6irc.net>2014-02-22 15:47:29 +0100
commitc0d3a235745a2291374ed4a21082e123af7b3440 (patch)
tree6a2c38cdea47121cb54a54dc4f7f6e5cd0d04192
parenta720540e8400a6087ce107478cb30bf4e22715f9 (diff)
actually fix png posting for some images not fully supported by gm/imagemagick
-rw-r--r--inc/image.php14
1 files changed, 6 insertions, 8 deletions
diff --git a/inc/image.php b/inc/image.php
index ced3296f..59182693 100644
--- a/inc/image.php
+++ b/inc/image.php
@@ -338,10 +338,8 @@ class ImageConvert extends ImageBase {
$this->width,
$this->height,
escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
- //if (!preg_match ('/sBIT: invalid/', $error)) {
- // $this->destroy();
- // error(_('Failed to resize image!'), null, $error);
- //}
+ $this->destroy();
+ error(_('Failed to resize image!'), null, $error);
}
if ($size = $this->get_size($this->temp)) {
$this->width = $size[0];
@@ -363,10 +361,10 @@ class ImageConvert extends ImageBase {
$this->width,
$this->height,
escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
- if (!preg_match ('/sBIT: invalid/', $error)) {
- $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];