eessppeelllloo/image-sequencer
1
0
Fork 0
mirror of https://github.com/publiclab/image-sequencer.git synced 2025-12-11 10:49:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into stable

Browse Source
This commit is contained in:
jywarren
2019-05-25 13:11:07 -04:00
parent 8950eba228 b506f7a356
commit 38204cc668
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/CanvasResize/Module.js
View File

@@ -10,10 +10,10 @@ module.exports = function canvasResize(options, UI) {
function draw(input, callback, progressObj) {
options.width = options.width || defaults.width;
options.height = options.height || defaults.height;
options.x = options.x || defaults.x;
options.y = options.y || defaults.y;
options.width = parseInt(options.width || defaults.width);
options.height = parseInt(options.height || defaults.height);
options.x = parseInt(options.x || defaults.x);
options.y = parseInt(options.y || defaults.y);
progressObj.stop(true);
progressObj.overrideFlag = true;
@@ -21,7 +21,6 @@ module.exports = function canvasResize(options, UI) {
var step = this;
function extraManipulation(pixels) {
let newPixels = require('ndarray')(new Uint8Array(4 * options.width * options.height).fill(255), [options.width, options.height, 4]);
let iMax = options.width - options.x,
jMax = options.height - options.y;

2
src/modules/ImportImage/Module.js
View File

@@ -9,7 +9,7 @@
module.exports = function ImportImageModule(options, UI) {
var defaults = require('./../../util/getDefaults.js')(require('./info.json'));
options.imageUrl = options.inBrowser ? (options.url || defaults.url) : './examples/images/monarch.png';
options.imageUrl = options.inBrowser ? (options.url || defaults.url) : (options.url || './examples/images/monarch.png');
var output;