kashire/lainchan
4
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

actually fix png posting for some images not fully supported by gm/imagemagick

Browse Source
This commit is contained in:
czaks 2014-02-22 15:47:29 +01:00
parent a720540e84
commit c0d3a23574
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
inc/image.php
View File

@ -338,10 +338,8 @@ class ImageConvert extends ImageBase {
$this->width, $this->width,
$this->height, $this->height,
escapeshellarg($this->temp)))) || !file_exists($this->temp)) { escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
//if (!preg_match ('/sBIT: invalid/', $error)) { $this->destroy();
// $this->destroy(); error(_('Failed to resize image!'), null, $error);
// error(_('Failed to resize image!'), null, $error);
//}
} }
if ($size = $this->get_size($this->temp)) { if ($size = $this->get_size($this->temp)) {
$this->width = $size[0]; $this->width = $size[0];
@ -363,10 +361,10 @@ class ImageConvert extends ImageBase {
$this->width, $this->width,
$this->height, $this->height,
escapeshellarg($this->temp)))) || !file_exists($this->temp)) { escapeshellarg($this->temp)))) || !file_exists($this->temp)) {
if (!preg_match ('/sBIT: invalid/', $error)) { //if (!preg_match ('/sBIT: invalid/', $error)) {
$this->destroy(); // $this->destroy();
error(_('Failed to resize image!'), null, $error); // error(_('Failed to resize image!'), null, $error);
} //}
} }
if ($size = $this->get_size($this->temp)) { if ($size = $this->get_size($this->temp)) {
$this->width = $size[0]; $this->width = $size[0];