forked from leftypol/leftypol
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
This commit is contained in:
commit
805c729892
4 changed files with 93 additions and 7 deletions
|
@ -175,6 +175,9 @@ class ImageImagick extends ImageBase {
|
|||
}
|
||||
}
|
||||
public function to($src) {
|
||||
if ($config['strip_exif']) {
|
||||
$this->image->stripImage();
|
||||
}
|
||||
if (preg_match('/\.gif$/i', $src))
|
||||
$this->image->writeImages($src, true);
|
||||
else
|
||||
|
@ -245,9 +248,14 @@ class ImageConvert extends ImageBase {
|
|||
}
|
||||
}
|
||||
public function to($src) {
|
||||
global $config;
|
||||
|
||||
if (!$this->temp) {
|
||||
// $config['redraw_image']
|
||||
shell_exec('convert ' . escapeshellarg($this->src) . ' ' . escapeshellarg($src));
|
||||
if ($config['strip_exif']) {
|
||||
shell_exec('convert ' . escapeshellarg($this->src) . ' -strip ' . escapeshellarg($src));
|
||||
} else {
|
||||
shell_exec('convert ' . escapeshellarg($this->src) . ' ' . escapeshellarg($src));
|
||||
}
|
||||
} else {
|
||||
rename($this->temp, $src);
|
||||
chmod($src, 0664);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue