Merge branch 'SwanX1-master'
This commit is contained in:
commit
24b828ccf6
1 changed files with 2 additions and 2 deletions
|
@ -9,13 +9,13 @@ const magick = nodeRequire(`../build/${process.env.DEBUG && process.env.DEBUG ==
|
||||||
function run(object) {
|
function run(object) {
|
||||||
return new Promise((resolve, reject) => {
|
return new Promise((resolve, reject) => {
|
||||||
// If the image has a path, it must also have a type
|
// If the image has a path, it must also have a type
|
||||||
let promise = new Promise((resolveTest) => { resolveTest(); }); // no-op
|
let promise = Promise.resolve();
|
||||||
if (object.path) {
|
if (object.path) {
|
||||||
if (object.params.type !== "image/gif" && object.onlyGIF) resolve({
|
if (object.params.type !== "image/gif" && object.onlyGIF) resolve({
|
||||||
buffer: Buffer.alloc(0),
|
buffer: Buffer.alloc(0),
|
||||||
fileExtension: "nogif"
|
fileExtension: "nogif"
|
||||||
});
|
});
|
||||||
promise = fetch(object.path).then(res => res.arrayBuffer()).then(buf => { return Buffer.from(buf); });
|
promise = fetch(object.path).then(res => res.arrayBuffer()).then(buf => Buffer.from(buf));
|
||||||
}
|
}
|
||||||
// Convert from a MIME type (e.g. "image/png") to something ImageMagick understands (e.g. "png").
|
// Convert from a MIME type (e.g. "image/png") to something ImageMagick understands (e.g. "png").
|
||||||
// Don't set `type` directly on the object we are passed as it will be read afterwards.
|
// Don't set `type` directly on the object we are passed as it will be read afterwards.
|
||||||
|
|
Loading…
Reference in a new issue