fix: toSize4 + sequential

Author: piercus

lib/augmenters/additive-gaussian-noise.js

@@ -33,10 +33,6 @@ class AdditiveGaussianNoiseAugmenter extends AbstractAugmenter {
 			context: 'colorPixel'
 		});
 
-		const perChannelRef = h.reference({
-			source: this.perChannel,
-			context: 'image'
-		});
 		return h.object({
 			noise: h.matrix({
 				shape: h.array([

lib/augmenters/additive-poisson-noise.js

@@ -30,10 +30,6 @@ class AdditivePoissonNoiseAugmenter extends AbstractAugmenter {
 			context: 'colorPixel'
 		});
 
-		const perChannelRef = h.reference({
-			source: this.perChannel,
-			context: 'image'
-		});
 		return h.object({
 			noise: h.matrix({
 				shape: h.array([

lib/augmenters/affine-transform.js

@@ -57,13 +57,13 @@ class AffineTransformAugmenter extends AbstractAugmenter {
 
 		const a2Base = (translatePercent[0] * width);
 
-		const a2 = a2Base - a0 * centerX - a1 * centerY + centerX;
+		const a2 = a2Base - (a0 * centerX) - (a1 * centerY) + centerX;
 
 		const b0 = scale[0] * Math.sin(rot);
 		const b1 = scale[1] * Math.cos(rot + shr);
 
 		const b2Base = (translatePercent[1] * height);
-		const b2 = b2Base - b0 * centerY - b1 * centerX + centerY;
+		const b2 = b2Base - (b0 * centerY) - (b1 * centerX) + centerY;
 		return this.backend.floatMatrix([[a0, a1, a2], [b0, b1, b2]]);
 	}
 

lib/augmenters/crop.js

@@ -29,9 +29,9 @@ class CropAugmenter extends AbstractAugmenter {
 	getRect({width, height, percent}) {
 		return {
 			x: Math.round(percent[0] * width),
-			y: Math.round(percent[2] * height),
-			w: width - Math.round(percent[1] * width) - Math.round(percent[0] * width),
-			h: height - Math.round(percent[2] * height) - Math.round(percent[3] * height)
+			y: Math.round(percent[1] * height),
+			w: width - Math.round(percent[2] * width) - Math.round(percent[0] * width),
+			h: height - Math.round(percent[3] * height) - Math.round(percent[1] * height)
 		};
 	}
 

lib/augmenters/sequential.js

@@ -1,15 +1,17 @@
 const hasard = require('hasard');
+const AbstractAugmenter = require('./abstract');
 
-class Sequential {
+class Sequential extends AbstractAugmenter {
 	constructor(opts) {
+		super(opts);
 		if (Array.isArray(opts) || hasard.isHasard(opts)) {
 			this.steps = opts;
 		} else {
 			this.steps = opts.steps;
 		}
 	}
 
-	run({img, points = [], boxes = []}) {
+	runOnce({img, points = [], boxes = []}) {
 		let steps;
 		if (hasard.isHasard(this.steps)) {
 			steps = this.steps.runOnce();
@@ -24,17 +26,13 @@ class Sequential {
 		const width = img.cols;
 		const height = img.rows;
 
-		let promise = Promise.resolve({img, points, width, height, boxes});
+		let res = {img, points, width, height, boxes};
 
 		steps.forEach(step => {
-			const newPromise = promise.then(o => {
-				return step.runOnce(o);
-			});
-
-			promise = newPromise;
+			res = step.runOnce(res);
 		});
 
-		return promise;
+		return res;
 	}
 }
 module.exports = Sequential;

lib/backend/opencv-backend.js

@@ -134,7 +134,7 @@ class OpenCVBackend {
 			img2 = img;
 		}
 
-		const res = img2.copyMakeBorder(borders[2], borders[3], borders[0], borders[1], borderCopyMode, borderCopyValue);
+		const res = img2.copyMakeBorder(borders[1], borders[3], borders[0], borders[2], borderCopyMode, borderCopyValue);
 		return res;
 	}
 

test/augmenters/sequential.js

@@ -2,7 +2,7 @@ const path = require('path');
 const test = require('ava');
 const Sequential = require('../../lib/augmenters/sequential');
 const Blur = require('../../lib/augmenters/blur');
-const Resize = require('../../lib/augmenters/blur');
+const Resize = require('../../lib/augmenters/resize');
 
 const macroAugmenter = require('../macros/augmenter');