summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcin Łabanowski <marcin@6irc.net>2012-12-22 20:16:31 +0100
committerMarcin Łabanowski <marcin@6irc.net>2012-12-22 20:16:31 +0100
commit0812799eb44124d6f07546897918067a34cc84e1 (patch)
tree55563af018a0601c47c6a375ca5b500dc76b945b
parent56eb3c6b15043823ba1c2476dc9ce408cafb93c1 (diff)
Fix animated .gif conversion when $config['thumb_ext'] == ''
-rw-r--r--inc/image.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/inc/image.php b/inc/image.php
index 860dd4d8..4b90396d 100644
--- a/inc/image.php
+++ b/inc/image.php
@@ -183,7 +183,7 @@ class ImageImagick extends ImageBase {
public function resize() {
global $config;
- if ($this->format == 'gif' && $config['thumb_ext'] == 'gif') {
+ if ($this->format == 'gif' && ($config['thumb_ext'] == 'gif' || $config['thumb_ext'] == '')) {
$this->image = new Imagick();
$this->image->setFormat('gif');
@@ -266,7 +266,7 @@ class ImageConvert extends ImageBase {
$quality = $config['thumb_quality'] * 10;
- if ($this->format == 'gif' && $config['thumb_ext'] == 'gif' && $config['thumb_keep_animation_frames'] > 1) {
+ if ($this->format == 'gif' && ($config['thumb_ext'] == 'gif' || $config['thumb_ext'] == '') && $config['thumb_keep_animation_frames'] > 1) {
if (shell_exec("convert -background transparent -filter Point -sample {$this->width}x{$this->height} +antialias -quality {$quality} " .
escapeshellarg($this->src . '') . " " . escapeshellarg($this->temp)) || !file_exists($this->temp))
error('Failed to resize image!');