image-js 0.35.2 → 0.35.4

package/lib/util/histogram.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.mean = mean;
 exports.median = median;
-
 /**
  * Returns the median of an histogram
  * @param {number[]} histogram
@@ -14,54 +13,44 @@ exports.median = median;
  */
 function median(histogram) {
   let total = histogram.reduce((sum, x) => sum + x);
-
   if (total === 0) {
     throw new Error('unreachable');
   }
-
   let position = 0;
   let currentTotal = 0;
   let middle = total / 2;
   let previous;
-
   while (true) {
     if (histogram[position] > 0) {
       if (previous !== undefined) {
         return (previous + position) / 2;
       }
-
       currentTotal += histogram[position];
-
       if (currentTotal > middle) {
         return position;
       } else if (currentTotal === middle) {
         previous = position;
       }
     }
-
     position++;
   }
 }
+
 /**
  * Retuns the mean of an histogram
  * @param {number[]} histogram
  * @return {number}
  * @private
  */
-
-
 function mean(histogram) {
   let total = 0;
   let sum = 0;
-
   for (let i = 0; i < histogram.length; i++) {
     total += histogram[i];
     sum += histogram[i] * i;
   }
-
   if (total === 0) {
     return 0;
   }
-
   return sum / total;
 }

package/lib/util/kernel.js

@@ -4,14 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.validateKernel = validateKernel;
-
 var _isInteger = _interopRequireDefault(require("is-integer"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function validateKernel(kernel) {
   let kHeight, kWidth;
-
   if (Array.isArray(kernel)) {
     if (Array.isArray(kernel[0])) {
       // 2D array
@@ -23,30 +19,24 @@ function validateKernel(kernel) {
       }
     } else {
       let kernelWidth = Math.sqrt(kernel.length);
-
       if ((0, _isInteger.default)(kernelWidth)) {
         kWidth = kHeight = Math.floor(Math.sqrt(kernel.length) / 2);
       } else {
         throw new RangeError('validateKernel: Kernel array should be a square');
-      } // we convert the array to a matrix
-
-
+      }
+      // we convert the array to a matrix
       let newKernel = new Array(kernelWidth);
-
       for (let i = 0; i < kernelWidth; i++) {
         newKernel[i] = new Array(kernelWidth);
-
         for (let j = 0; j < kernelWidth; j++) {
           newKernel[i][j] = kernel[i * kernelWidth + j];
         }
       }
-
       kernel = newKernel;
     }
   } else {
     throw new Error(`validateKernel: Invalid Kernel: ${kernel}`);
   }
-
   return {
     kernel,
     kWidth,

package/lib/util/matrix.js

@@ -4,14 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = Matrix;
-
 function Matrix(width, height, defaultValue) {
   const matrix = new Array(width);
-
   for (let x = 0; x < width; x++) {
     matrix[x] = new Array(height);
   }
-
   if (defaultValue) {
     for (let x = 0; x < width; x++) {
       for (let y = 0; y < height; y++) {
@@ -19,17 +16,14 @@ function Matrix(width, height, defaultValue) {
       }
     }
   }
-
   matrix.width = width;
   matrix.height = height;
   Object.setPrototypeOf(matrix, Matrix.prototype);
   return matrix;
 }
-
 Matrix.prototype.localMin = function (x, y) {
   let min = this[x][y];
   let position = [x, y];
-
   for (let i = Math.max(0, x - 1); i < Math.min(this.length, x + 2); i++) {
     for (let j = Math.max(0, y - 1); j < Math.min(this[0].length, y + 2); j++) {
       if (this[i][j] < min) {
@@ -38,17 +32,14 @@ Matrix.prototype.localMin = function (x, y) {
       }
     }
   }
-
   return {
     position: position,
     value: min
   };
 };
-
 Matrix.prototype.localMax = function (x, y) {
   let max = this[x][y];
   let position = [x, y];
-
   for (let i = Math.max(0, x - 1); i < Math.min(this.length, x + 2); i++) {
     for (let j = Math.max(0, y - 1); j < Math.min(this[0].length, y + 2); j++) {
       if (this[i][j] > max) {
@@ -57,16 +48,13 @@ Matrix.prototype.localMax = function (x, y) {
       }
     }
   }
-
   return {
     position: position,
     value: max
   };
 };
-
 Matrix.prototype.localSearch = function (x, y, value) {
   let results = [];
-
   for (let i = Math.max(0, x - 1); i < Math.min(this.length, x + 2); i++) {
     for (let j = Math.max(0, y - 1); j < Math.min(this[0].length, y + 2); j++) {
       if (this[i][j] === value) {
@@ -74,6 +62,5 @@ Matrix.prototype.localSearch = function (x, y, value) {
       }
     }
   }
-
   return results;
 };

package/lib/util/points.js

@@ -14,7 +14,6 @@ exports.perimeter = perimeter;
 exports.rotate = rotate;
 exports.round = round;
 exports.surface = surface;
-
 /**
  * Rounds all the x and y values of an array of points
  * @param {Array<Array<number>>} points
@@ -26,9 +25,9 @@ function round(points) {
     points[i][0] = Math.round(points[i][0]);
     points[i][1] = Math.round(points[i][1]);
   }
-
   return points;
 }
+
 /**
  * Calculates a new point that is the difference p1 - p2
  * @param {Array<number>} p1
@@ -36,23 +35,21 @@ function round(points) {
  * @return {Array<number>}
  * @private
  */
-
-
 function difference(p1, p2) {
   return [p1[0] - p2[0], p1[1] - p2[1]];
 }
+
 /**
  * Normalize a point
  * @param {Array<number>} p
  * @return {Array<number>}
  * @private
  */
-
-
 function normalize(p) {
   let length = Math.sqrt(p[0] ** 2 + p[1] ** 2);
   return [p[0] / length, p[1] / length];
 }
+
 /**
  * We rotate an array of points
  * @param {number} radians
@@ -61,19 +58,16 @@ function normalize(p) {
  * @return {Array<Array<number>>}
  * @private
  */
-
-
 function rotate(radians, srcPoints, destPoints) {
   if (destPoints === undefined) destPoints = new Array(srcPoints.length);
   let cos = Math.cos(radians);
   let sin = Math.sin(radians);
-
   for (let i = 0; i < destPoints.length; ++i) {
     destPoints[i] = [cos * srcPoints[i][0] - sin * srcPoints[i][1], sin * srcPoints[i][0] + cos * srcPoints[i][1]];
   }
-
   return destPoints;
 }
+
 /**
  * Dot products of 2 points assuming vectors starting from (0,0)
  * @param {Array<number>} p1
@@ -81,11 +75,10 @@ function rotate(radians, srcPoints, destPoints) {
  * @return {number}
  * @private
  */
-
-
 function dot(p1, p2) {
   return p1[0] * p2[0] + p1[1] * p2[1];
 }
+
 /**
  * Returns the angle between 3 points. The first one is a common point
  * @param {Array<number>} origin
@@ -94,23 +87,20 @@ function dot(p1, p2) {
  * @return {number}
  * @private
  */
-
-
 function angle(origin, p1, p2) {
   let v1 = normalize(difference(p1, origin));
   let v2 = normalize(difference(p2, origin));
-  let dotProduct = dot(v1, v2); // TODO this code is not correct because it may yield the opposite angle
-
+  let dotProduct = dot(v1, v2);
+  // TODO this code is not correct because it may yield the opposite angle
   return Math.acos(dotProduct);
 }
+
 /**
  * Returns the 4 points of an horizontal rectangle that includes all the points
  * @param {Array<Array<number>>} points
  * @return {Array<Array<number>>}
  * @private
  */
-
-
 function boundary(points) {
   let minMaxValues = minMax(points);
   let xMin = minMaxValues[0][0];
@@ -119,15 +109,13 @@ function boundary(points) {
   let yMax = minMaxValues[1][1];
   return [[xMin, yMin], [xMax, yMin], [xMax, yMax], [xMin, yMax]];
 }
+
 /**
  * Returns the perimeter represented by the points (a polygon)
  * @param {Array<Array<number>>} points
  */
-
-
 function perimeter(vertices) {
   let total = 0;
-
   for (let i = 0; i < vertices.length; i++) {
     let fromX = vertices[i][0];
     let fromY = vertices[i][1];
@@ -135,18 +123,15 @@ function perimeter(vertices) {
     let toY = vertices[i === vertices.length - 1 ? 0 : i + 1][1];
     total += Math.sqrt((toX - fromX) ** 2 + (toY - fromY) ** 2);
   }
-
   return total;
 }
+
 /**
  * Returns the surface represented by the points (a polygon)
  * @param {Array<Array<number>>} points
  */
-
-
 function surface(vertices) {
   let total = 0;
-
   for (let i = 0; i < vertices.length; i++) {
     let addX = vertices[i][0];
     let addY = vertices[i === vertices.length - 1 ? 0 : i + 1][1];
@@ -155,32 +140,29 @@ function surface(vertices) {
     total += addX * addY * 0.5;
     total -= subX * subY * 0.5;
   }
-
   return Math.abs(total);
 }
+
 /**
  * Returns 2 points with minimal and maximal XY
  * @param {Array<Array<number>>} points
  * @return {Array<Array<number>>}
  * @private
  */
-
-
 function minMax(points) {
   let xMin = +Infinity;
   let yMin = +Infinity;
   let xMax = -Infinity;
   let yMax = -Infinity;
-
   for (let i = 0; i < points.length; i++) {
     if (points[i][0] < xMin) xMin = points[i][0];
     if (points[i][0] > xMax) xMax = points[i][0];
     if (points[i][1] < yMin) yMin = points[i][1];
     if (points[i][1] > yMax) yMax = points[i][1];
   }
-
   return [[xMin, yMin], [xMax, yMax]];
 }
+
 /**
  * Moves the minX, minY to 0,0
  * All the points will be positive after this move
@@ -189,21 +171,16 @@ function minMax(points) {
  * @return {Array<Array<number>>}
  * @private
  */
-
-
 function moveToZeroZero(srcPoints, destPoints) {
   if (destPoints === undefined) {
     destPoints = new Array(srcPoints.length).fill(0).map(() => []);
   }
-
   let minMaxValues = minMax(srcPoints);
   let xMin = minMaxValues[0][0];
   let yMin = minMaxValues[0][1];
-
   for (let i = 0; i < srcPoints.length; i++) {
     destPoints[i][0] = srcPoints[i][0] - xMin;
     destPoints[i][1] = srcPoints[i][1] - yMin;
   }
-
   return destPoints;
 }

package/lib/util/value.js

@@ -4,29 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.checkNumberArray = checkNumberArray;
-
 var _isArrayType = _interopRequireDefault(require("is-array-type"));
-
 var _Image = _interopRequireDefault(require("../image/Image"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 function checkNumberArray(value) {
   if (!isNaN(value)) {
     if (value <= 0) {
       throw new Error('checkNumberArray: the value must be greater than 0');
     }
-
     return value;
   } else {
     if (value instanceof _Image.default) {
       return value.data;
     }
-
     if (!(0, _isArrayType.default)(value)) {
       throw new Error('checkNumberArray: the value should be either a number, array or Image');
     }
-
     return value;
   }
 }

package/lib/util/zerosMatrix.js

@@ -4,13 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = zerosMatrix;
-
 function zerosMatrix(height, width) {
   let matrix = new Array(height);
-
   for (let i = 0; i < height; i++) {
     matrix[i] = new Array(width).fill(0);
   }
-
   return matrix;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "image-js",
-  "version": "0.35.2",
+  "version": "0.35.4",
   "description": "Image processing and manipulation in JavaScript",
   "keywords": [
     "image",

package/src/image/utility/setMatrix.js

@@ -7,6 +7,8 @@ import { Matrix } from 'ml-matrix';
  * @param {Matrix} matrix
  * @param {object} [options]
  * @param {number} [options.channel]
+ *
+ * @return {this}
  */
 export default function setMatrix(matrix, options = {}) {
   matrix = new Matrix(matrix);
@@ -35,4 +37,6 @@ export default function setMatrix(matrix, options = {}) {
       this.setValueXY(y, x, channel, matrix.get(x, y));
     }
   }
+
+  return this;
 }