summaryrefslogtreecommitdiff
path: root/inc/image.php
diff options
context:
space:
mode:
Diffstat (limited to 'inc/image.php')
-rw-r--r--inc/image.php8
1 files changed, 5 insertions, 3 deletions
diff --git a/inc/image.php b/inc/image.php
index 7aea9bfe..8cc9d69b 100644
--- a/inc/image.php
+++ b/inc/image.php
@@ -81,9 +81,7 @@ class Image {
$height = $max_height;
}
- if ($gifsicle) {
- $thumb->gifsicle = 1;
- }
+ $thumb->gifsicle = $gifsicle;
$thumb->_resize($this->image->image, $width, $height);
return $thumb;
@@ -288,8 +286,12 @@ class ImageConvert extends ImageBase {
if (shell_exec("gifsicle --unoptimize -O2 --resize {$this->width}x{$this->height} < " .
escapeshellarg($this->src . '') . " > " . escapeshellarg($this->temp)) || !file_exists($this->temp))
error('Failed to resize image!');
+<<<<<<< HEAD
}
else {
+=======
+ } else {
+>>>>>>> 8e4c493a4c5bbff07483fd4a11c44c687c99e441
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!');