diff options
| author | czaks <marcin@6irc.net> | 2013-07-31 15:01:44 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-07-31 15:01:44 -0400 |
| commit | 3d979750b1be802549e4e18662c7e642f466daaa (patch) | |
| tree | f6fe3cfd24e250542b2c217f16e5612bc0d3bfd8 | |
| parent | 55c7146d884005f70d15e991a9e8ea31b7021361 (diff) | |
fix merge
| -rw-r--r-- | inc/image.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/inc/image.php b/inc/image.php index 8cc9d69b..99c10252 100644 --- a/inc/image.php +++ b/inc/image.php @@ -286,12 +286,7 @@ 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!'); |