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

convert: Don't rely on PHP GD to get the image dimensions; use identify.

Browse Source
This commit is contained in:
Michael Save 2012-03-17 22:49:56 +11:00
parent fe7182404f
commit c6478b378f
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
inc/image.php
View File

@ -220,14 +220,16 @@
} }
public function from() { public function from() {
if(!$size = @getimagesize($this->src)) $size = trim(shell_exec('identify -format "%w %h" ' . escapeshellarg($this->src . '[0]')));
return $this->image = false; if(preg_match('/^(\d+) (\d+)$/', $size, $m)) {
$this->width = $m[1];
$this->height = $m[2];
$this->width = $size[0];
$this->height = $size[1];
// mark as valid
$this->image = true; $this->image = true;
} else {
// mark as invalid
$this->image = false;
}
} }
public function to($src) { public function to($src) {
rename($this->temp, $src); rename($this->temp, $src);
@ -247,7 +249,7 @@
$quality = $config['thumb_quality'] * 10; $quality = $config['thumb_quality'] * 10;
if(shell_exec("convert -flatten -antialias -filter Point -scale {$this->width}x{$this->height} -quality {$quality} " . escapeshellarg($this->src . '[0]') . " " . escapeshellarg($this->temp))) if(shell_exec("convert -flatten -antialias -filter Point -scale {$this->width}x{$this->height} -quality {$quality} " . escapeshellarg($this->src . '[0]') . " " . escapeshellarg($this->temp)) || !file_exists($this->temp))
error('Failed to resize image!'); error('Failed to resize image!');
} }
} }