summaryrefslogtreecommitdiff
path: root/src/api/common
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-12-09 22:35:26 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-12-09 22:35:26 +0900
commit37edacce44cb7d63c35fee88e0b43028a1c7765c (patch)
tree2308aebade23ae7cce79fd8b8bcfa488a5359c95 /src/api/common
parentv3310 (diff)
downloadsharkey-37edacce44cb7d63c35fee88e0b43028a1c7765c.tar.gz
sharkey-37edacce44cb7d63c35fee88e0b43028a1c7765c.tar.bz2
sharkey-37edacce44cb7d63c35fee88e0b43028a1c7765c.zip
Use ImageMagick instead of GraphicsMagick
Diffstat (limited to 'src/api/common')
-rw-r--r--src/api/common/add-file-to-drive.ts6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index dea02eeca6..109e886106 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -5,7 +5,7 @@ import * as stream from 'stream';
import * as mongodb from 'mongodb';
import * as crypto from 'crypto';
-import * as gm from 'gm';
+import * as _gm from 'gm';
import * as debug from 'debug';
import fileType = require('file-type');
import prominence = require('prominence');
@@ -16,6 +16,10 @@ import serialize from '../serializers/drive-file';
import event, { publishDriveStream } from '../event';
import config from '../../conf';
+const gm = _gm.subClass({
+ imageMagick: true
+});
+
const log = debug('misskey:register-drive-file');
const tmpFile = (): Promise<string> => new Promise((resolve, reject) => {