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

image resizing: fix a problem with some pngs; reported by urban

Browse Source
This commit is contained in:
czaks 2014-01-04 19:09:30 +01:00
parent 4202e8123d
commit 9a5f3b2e31
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
inc/image.php
View File

@ -338,9 +338,11 @@ 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];
$this->height = $size[1]; $this->height = $size[1];
@ -361,9 +363,11 @@ 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];
$this->height = $size[1]; $this->height = $size[1];