Page MenuHomePhabricator
Files F14057846

D12813.diff
No OneTemporary
Actions

D12813.diff
View Options

diff --git a/src/applications/files/transform/PhabricatorFileImageTransform.php b/src/applications/files/transform/PhabricatorFileImageTransform.php
--- a/src/applications/files/transform/PhabricatorFileImageTransform.php
+++ b/src/applications/files/transform/PhabricatorFileImageTransform.php
@@ -42,7 +42,19 @@
$off_x = ($dst_w - $cpy_w) / 2;
$off_y = ($dst_h - $cpy_h) / 2;
- // TODO: Support imagemagick for animated GIFs.
+ if ($this->shouldUseImagemagick()) {
+ $argv = array();
+ $argv[] = '-coalesce';
+ $argv[] = '-shave';
+ $argv[] = $src_x.'x'.$src_y;
+ $argv[] = '-resize';
+ $argv[] = $dst_w.'x'.$dst_h.'>';
+ $argv[] = '-bordercolor';
+ $argv[] = 'rgba(255, 255, 255, 0)';
+ $argv[] = '-border';
+ $argv[] = $off_x.'x'.$off_y;
+ return $this->applyImagemagick($argv);
+ }
$src = $this->getImage();
$dst = $this->newEmptyImage($dst_w, $dst_h);
@@ -72,6 +84,22 @@
return $this->newFileFromData($data);
}
+ protected function applyImagemagick(array $argv) {
+ $tmp = new TempFile();
+ Filesystem::writeFile($tmp, $this->getData());
+
+ $out = new TempFile();
+
+ $future = new ExecFuture('convert %s %Ls %s', $tmp, $argv, $out);
+ // Don't spend more than 10 seconds resizing; just fail if it takes longer
+ // than that.
+ $future->setTimeout(10)->resolvex();
+
+ $data = Filesystem::readFile($out);
+
+ return $this->newFileFromData($data);
+ }
+
/**
* Create a new @{class:PhabricatorFile} from raw data.
@@ -299,4 +327,22 @@
return $this->image;
}
+ private function shouldUseImagemagick() {
+ if (!PhabricatorEnv::getEnvConfig('files.enable-imagemagick')) {
+ return false;
+ }
+
+ if ($this->file->getMimeType() != 'image/gif') {
+ return false;
+ }
+
+ // Don't try to preserve the animation in huge GIFs.
+ list($x, $y) = $this->getImageDimensions();
+ if (($x * $y) > (512 * 512)) {
+ return false;
+ }
+
+ return true;
+ }
+
}

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 18, 7:19 AM (21 h, 19 m ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6724877
Default Alt Text
D12813.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility