image-js 0.35.1 → 0.35.3

package/lib/image/utility/getBestMatch.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getBestMatch;
-
 var _matrix = _interopRequireDefault(require("../../util/matrix"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Try to match the current pictures with another one
  * @memberof Image
@@ -24,30 +21,25 @@ function getBestMatch(image, options = {}) {
   this.checkProcessable('getChannel', {
     bitDepth: [8, 16]
   });
-
   if (this.bitDepth !== image.bitDepth) {
     throw new Error('Both images must have the same bitDepth');
   }
-
   if (this.channels !== image.channels) {
     throw new Error('Both images must have the same number of channels');
   }
-
   if (this.colorModel !== image.colorModel) {
     throw new Error('Both images must have the same colorModel');
-  } // there could be many names
-
+  }
 
+  // there could be many names
   let similarityMatrix = new _matrix.default(image.width, image.height, -Infinity);
   let currentX = Math.floor(image.width / 2);
   let currentY = Math.floor(image.height / 2);
   let middleX = currentX;
   let middleY = currentY;
   let theEnd = false;
-
   while (!theEnd) {
     let toCalculatePositions = similarityMatrix.localSearch(currentX, currentY, -Infinity);
-
     for (let i = 0; i < toCalculatePositions.length; i++) {
       let position = toCalculatePositions[i];
       let similarity = this.getSimilarity(image, {
@@ -56,9 +48,7 @@ function getBestMatch(image, options = {}) {
       });
       similarityMatrix[position[0]][position[1]] = similarity;
     }
-
     let max = similarityMatrix.localMax(currentX, currentY);
-
     if (max.position[0] !== currentX || max.position[1] !== currentY) {
       currentX = max.position[0];
       currentY = max.position[1];
@@ -66,6 +56,5 @@ function getBestMatch(image, options = {}) {
       theEnd = true;
     }
   }
-
   return [currentX - middleX, currentY - middleY];
 }

package/lib/image/utility/getChannel.js

@@ -4,15 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getChannel;
-
 var _channel = require("../../util/channel");
-
 var _Image = _interopRequireDefault(require("../Image"));
-
 var _model = require("../model/model");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Create a grey image based on the selected channel
  * @memberof Image
@@ -34,26 +29,21 @@ function getChannel(channel, options = {}) {
     bitDepth: [8, 16]
   });
   channel = (0, _channel.validateChannel)(this, channel);
-
   let newImage = _Image.default.createFrom(this, {
     components: 1,
     alpha: keepAlpha,
     colorModel: _model.GREY
   });
-
   let ptr = 0;
-
   for (let j = 0; j < this.data.length; j += this.channels) {
     if (mergeAlpha) {
       newImage.data[ptr++] = this.data[j + channel] * this.data[j + this.components] / this.maxValue;
     } else {
       newImage.data[ptr++] = this.data[j + channel];
-
       if (keepAlpha) {
         newImage.data[ptr++] = this.data[j + this.components];
       }
     }
   }
-
   return newImage;
 }

package/lib/image/utility/getClosestCommonParent.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getClosestCommonParent;
-
 /**
  * Finds common parent between two different masks
  * @memberof Image
@@ -16,59 +15,49 @@ function getClosestCommonParent(mask) {
   let depthMask1 = getDepth(this);
   let depthMask2 = getDepth(mask);
   let furthestParent;
-
   if (depthMask1 >= depthMask2) {
     furthestParent = getFurthestParent(this, depthMask1);
   } else {
     furthestParent = getFurthestParent(mask, depthMask2);
   }
-
   if (depthMask1 === 0 || depthMask2 === 0) {
     // comparing with at least one original image -> no common parent
     return furthestParent;
   }
-
   let m1 = this;
   let m2 = mask;
-
   while (depthMask1 !== depthMask2) {
     if (depthMask1 > depthMask2) {
       m1 = m1.parent;
-
       if (m1 === null) {
         return furthestParent;
       }
-
       depthMask1 = depthMask1 - 1;
     } else {
       m2 = m2.parent;
-
       if (m2 === null) {
         return furthestParent;
       }
-
       depthMask2 = depthMask2 - 1;
     }
   }
-
   while (m1 !== m2 && m1 !== null && m2 !== null) {
     m1 = m1.parent;
     m2 = m2.parent;
-
     if (m1 === null || m2 === null) {
       return furthestParent;
     }
-  } // TODO
+  }
+
+  // TODO
   // no common parent, use parent at top of hierarchy of m1
   // we assume it works for now
-
-
   if (m1 !== m2) {
     return furthestParent;
   }
-
   return m1;
 }
+
 /**
  * Find the depth of the mask with respect to its arborescence.
  * Helper function to find the common parent between two masks.
@@ -76,27 +65,21 @@ function getClosestCommonParent(mask) {
  * @return {number} - depth of mask
  * @private
  */
-
-
 function getDepth(mask) {
   let d = 0;
-  let m = mask; // a null parent means it's the original image
-
+  let m = mask;
+  // a null parent means it's the original image
   while (m.parent != null) {
     m = m.parent;
     d++;
   }
-
   return d;
 }
-
 function getFurthestParent(mask, depth) {
   let m = mask;
-
   while (depth > 0) {
     m = m.parent;
     depth = depth - 1;
   }
-
   return m;
 }

package/lib/image/utility/getColumn.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getColumn;
-
 var _checks = require("../internal/checks");
-
 /**
  * @memberof Image
  * @instance
@@ -23,10 +21,8 @@ function getColumn(column, channel = 0) {
   let array = new Array(this.height);
   let ptr = 0;
   let step = this.width * this.channels;
-
   for (let j = channel + column * this.channels; j < this.data.length; j += step) {
     array[ptr++] = this.data[j];
   }
-
   return array;
 }

package/lib/image/utility/getIntersection.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getIntersection;
-
 /**
  * Find intersection of points between two different masks
  * @memberof Image
@@ -29,49 +28,41 @@ function getIntersection(mask2) {
     whitePixelsMask2: [],
     commonWhitePixels: []
   };
-
   for (let i = 0; i < commonSurface.length; i++) {
     let currentRelativePos = commonSurface[i];
     let realPos1 = [currentRelativePos[0] - startPos1[0], currentRelativePos[1] - startPos1[1]];
     let realPos2 = [currentRelativePos[0] - startPos2[0], currentRelativePos[1] - startPos2[1]];
     let valueBitMask1 = mask1.getBitXY(realPos1[0], realPos1[1]);
     let valueBitMask2 = mask2.getBitXY(realPos2[0], realPos2[1]);
-
     if (valueBitMask1 === 1 && valueBitMask2 === 1) {
       intersection.commonWhitePixels.push(currentRelativePos);
     }
   }
-
   for (let i = 0; i < allRelPos1.length; i++) {
     let posX;
     let posY;
-
     if (i !== 0) {
       posX = Math.floor(i / mask1.width);
       posY = i % mask1.width;
     }
-
     if (mask1.getBitXY(posX, posY) === 1) {
       intersection.whitePixelsMask1.push(allRelPos1[i]);
     }
   }
-
   for (let i = 0; i < allRelPos2.length; i++) {
     let posX = 0;
     let posY = 0;
-
     if (i !== 0) {
       posX = Math.floor(i / mask2.width);
       posY = i % mask2.width;
     }
-
     if (mask2.getBitXY(posX, posY) === 1) {
       intersection.whitePixelsMask2.push(allRelPos2[i]);
     }
   }
-
   return intersection;
 }
+
 /**
  * Get relative position array for all pixels in masks
  * @param {Image} mask - a mask (1 bit image)
@@ -79,20 +70,17 @@ function getIntersection(mask2) {
  * @return {Array} - relative position of all pixels
  * @private
  */
-
-
 function getRelativePositionForAllPixels(mask, startPosition) {
   let relativePositions = [];
-
   for (let i = 0; i < mask.height; i++) {
     for (let j = 0; j < mask.width; j++) {
       let originalPos = [i, j];
       relativePositions.push([originalPos[0] + startPosition[0], originalPos[1] + startPosition[1]]);
     }
   }
-
   return relativePositions;
 }
+
 /**
  * Finds common surface for two arrays containing the positions of the pixels relative to parent image
  * @param {Array<number>} positionArray1 - positions of pixels relative to parent
@@ -100,13 +88,10 @@ function getRelativePositionForAllPixels(mask, startPosition) {
  * @return {Array<number>} - positions of common pixels for both arrays
  * @private
  */
-
-
 function getCommonSurface(positionArray1, positionArray2) {
   let i = 0;
   let j = 0;
   let commonSurface = [];
-
   while (i < positionArray1.length && j < positionArray2.length) {
     if (positionArray1[i][0] === positionArray2[j][0] && positionArray1[i][1] === positionArray2[j][1]) {
       commonSurface.push(positionArray1[i]);
@@ -118,6 +103,5 @@ function getCommonSurface(positionArray1, positionArray2) {
       j++;
     }
   }
-
   return commonSurface;
 }

package/lib/image/utility/getMatrix.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getMatrix;
-
 var _mlMatrix = require("ml-matrix");
-
 /**
  * @memberof Image
  * @instance
@@ -21,22 +19,17 @@ function getMatrix(options = {}) {
   this.checkProcessable('getMatrix', {
     bitDepth: [8, 16]
   });
-
   if (channel === undefined) {
     if (this.components > 1) {
       throw new RangeError('You need to define the channel for an image that contains more than one channel');
     }
-
     channel = 0;
   }
-
   let matrix = new _mlMatrix.Matrix(this.height, this.width);
-
   for (let x = 0; x < this.height; x++) {
     for (let y = 0; y < this.width; y++) {
       matrix.set(x, y, this.getValueXY(y, x, channel));
     }
   }
-
   return matrix;
 }

package/lib/image/utility/getPixelsArray.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getPixelsArray;
-
 /**
  * Returns an array of arrays containing the pixel values in the form
  * [[R1, G1, B1], [R2, G2, B2], ...]
@@ -18,16 +17,12 @@ function getPixelsArray() {
   });
   let array = new Array(this.size);
   let ptr = 0;
-
   for (let i = 0; i < this.data.length; i += this.channels) {
     let pixel = new Array(this.components);
-
     for (let j = 0; j < this.components; j++) {
       pixel[j] = this.data[i + j];
     }
-
     array[ptr++] = pixel;
   }
-
   return array;
 }

package/lib/image/utility/getPixelsGrid.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getPixelsGrid;
-
 /**
  * @memberof Image
  * @instance
@@ -24,11 +23,9 @@ function getPixelsGrid(options = {}) {
     bitDepth: [8, 16],
     channels: 1
   });
-
   if (!Array.isArray(sampling)) {
     sampling = [sampling, sampling];
   }
-
   const xSampling = sampling[0];
   const ySampling = sampling[1];
   const xyS = [];
@@ -36,33 +33,25 @@ function getPixelsGrid(options = {}) {
   const xStep = this.width / xSampling;
   const yStep = this.height / ySampling;
   let currentX = Math.floor(xStep / 2);
-
   for (let i = 0; i < xSampling; i++) {
     let currentY = Math.floor(yStep / 2);
-
     for (let j = 0; j < ySampling; j++) {
       let x = Math.round(currentX);
       let y = Math.round(currentY);
-
       if (!mask || mask.getBitXY(x, y)) {
         xyS.push([x, y]);
         zS.push(this.getPixelXY(x, y));
       }
-
       currentY += yStep;
     }
-
     currentX += xStep;
   }
-
   const toReturn = {
     xyS,
     zS
   };
-
   if (painted) {
     toReturn.painted = this.rgba8().paintPoints(xyS);
   }
-
   return toReturn;
 }

package/lib/image/utility/getRow.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getRow;
-
 var _checks = require("../internal/checks");
-
 /**
  * @memberof Image
  * @instance
@@ -24,10 +22,8 @@ function getRow(row, channel = 0) {
   let ptr = 0;
   let begin = row * this.width * this.channels + channel;
   let end = begin + this.width * this.channels;
-
   for (let j = begin; j < end; j += this.channels) {
     array[ptr++] = this.data[j];
   }
-
   return array;
 }

package/lib/image/utility/getSimilarity.js

@@ -4,13 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getSimilarity;
-
 var _newArray = _interopRequireDefault(require("new-array"));
-
 var _channel = require("../../util/channel");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * Try to match the current pictures with another one. If normalize we normalize separately the 2 images.
  * @memberof Image
@@ -31,45 +27,37 @@ function getSimilarity(image, options = {}) {
   this.checkProcessable('getSimilarity', {
     bitDepth: [8, 16]
   });
-
   if (!Array.isArray(border)) {
     border = [border, border];
   }
-
   channels = (0, _channel.validateArrayOfChannels)(this, {
     channels: channels,
     defaultAlpha: defaultAlpha
   });
-
   if (this.bitDepth !== image.bitDepth) {
     throw new Error('Both images must have the same bitDepth');
   }
-
   if (this.channels !== image.channels) {
     throw new Error('Both images must have the same number of channels');
   }
-
   if (this.colorModel !== image.colorModel) {
     throw new Error('Both images must have the same colorModel');
   }
-
   if (typeof average === 'undefined') {
     average = true;
-  } // we allow a shift
-  // we need to find the minX, maxX, minY, maxY
-
+  }
 
+  // we allow a shift
+  // we need to find the minX, maxX, minY, maxY
   let minX = Math.max(border[0], -shift[0]);
   let maxX = Math.min(this.width - border[0], this.width - shift[0]);
   let minY = Math.max(border[1], -shift[1]);
   let maxY = Math.min(this.height - border[1], this.height - shift[1]);
   let results = (0, _newArray.default)(channels.length, 0);
-
   for (let i = 0; i < channels.length; i++) {
     let c = channels[i];
     let sumThis = normalize ? this.sum[c] : Math.max(this.sum[c], image.sum[c]);
     let sumImage = normalize ? image.sum[c] : Math.max(this.sum[c], image.sum[c]);
-
     if (sumThis !== 0 && sumImage !== 0) {
       for (let x = minX; x < maxX; x++) {
         for (let y = minY; y < maxY; y++) {
@@ -80,10 +68,8 @@ function getSimilarity(image, options = {}) {
       }
     }
   }
-
   if (average) {
     return results.reduce((sum, x) => sum + x) / results.length;
   }
-
   return results;
 }

package/lib/image/utility/getThreshold.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = getThreshold;
-
 var _thresholdAlgorithms = require("../transform/mask/thresholdAlgorithms");
-
 /**
  * Returns a threshold for the creation of a binary mask with the `mask()` method.
  * @memberof Image
@@ -23,9 +21,7 @@ function getThreshold(options = {}) {
     components: 1,
     bitDepth: [8, 16]
   });
-
   let method = _thresholdAlgorithms.methods[algorithm.toLowerCase()];
-
   if (method) {
     let histogram = this.getHistogram();
     return method(histogram, this.size);

package/lib/image/utility/setBorder.js

@@ -4,11 +4,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = setBorder;
-
 var _newArray = _interopRequireDefault(require("new-array"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 /**
  * This method will change the border
  * @memberof Image
@@ -28,12 +25,10 @@ function setBorder(options = {}) {
   this.checkProcessable('setBorder', {
     bitDepth: [8, 16, 32, 64]
   });
-
   if (algorithm === 'set') {
     if (color.length !== this.channels) {
       throw new Error(`setBorder: the color array must have the same length as the number of channels. Here: ${this.channels}`);
     }
-
     for (let i = 0; i < color.length; i++) {
       if (color[i] === 0) {
         color[i] = 0.001;
@@ -42,46 +37,35 @@ function setBorder(options = {}) {
   } else {
     color = (0, _newArray.default)(this.channels, null);
   }
-
   if (!Array.isArray(size)) {
     size = [size, size];
   }
-
   let leftRightSize = size[0];
   let topBottomSize = size[1];
   let channels = this.channels;
-
   for (let i = leftRightSize; i < this.width - leftRightSize; i++) {
     for (let k = 0; k < channels; k++) {
       let value = color[k] || this.data[(i + this.width * topBottomSize) * channels + k];
-
       for (let j = 0; j < topBottomSize; j++) {
         this.data[(j * this.width + i) * channels + k] = value;
       }
-
       value = color[k] || this.data[(i + this.width * (this.height - topBottomSize - 1)) * channels + k];
-
       for (let j = this.height - topBottomSize; j < this.height; j++) {
         this.data[(j * this.width + i) * channels + k] = value;
       }
     }
   }
-
   for (let j = 0; j < this.height; j++) {
     for (let k = 0; k < channels; k++) {
       let value = color[k] || this.data[(j * this.width + leftRightSize) * channels + k];
-
       for (let i = 0; i < leftRightSize; i++) {
         this.data[(j * this.width + i) * channels + k] = value;
       }
-
       value = color[k] || this.data[(j * this.width + this.width - leftRightSize - 1) * channels + k];
-
       for (let i = this.width - leftRightSize; i < this.width; i++) {
         this.data[(j * this.width + i) * channels + k] = value;
       }
     }
   }
-
   return this;
 }

package/lib/image/utility/setChannel.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = setChannel;
-
 var _channel = require("../../util/channel");
-
 /**
  * @memberof Image
  * @instance
@@ -24,18 +22,14 @@ function setChannel(channel, image) {
     alpha: [0],
     components: [1]
   });
-
   if (image.width !== this.width || image.height !== this.height) {
     throw new Error('Images must have exactly the same width and height');
   }
-
   channel = (0, _channel.validateChannel)(this, channel);
   let ptr = channel;
-
   for (let i = 0; i < image.data.length; i++) {
     this.data[ptr] = image.data[i];
     ptr += this.channels;
   }
-
   return this;
 }

package/lib/image/utility/setMatrix.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = setMatrix;
-
 var _mlMatrix = require("ml-matrix");
-
 /**
  * We set the data of the image from a matrix. The size of the matrix and the data have to be the same.
  * @memberof Image
@@ -23,19 +21,15 @@ function setMatrix(matrix, options = {}) {
   this.checkProcessable('getMatrix', {
     bitDepth: [8, 16]
   });
-
   if (channel === undefined) {
     if (this.components > 1) {
       throw new RangeError('You need to define the channel for an image that contains more than one channel');
     }
-
     channel = 0;
   }
-
   if (this.width !== matrix.columns || this.height !== matrix.rows) {
     throw new RangeError('The size of the matrix must be equal to the size of the image');
   }
-
   for (let x = 0; x < this.height; x++) {
     for (let y = 0; y < this.width; y++) {
       this.setValueXY(y, x, channel, matrix.get(x, y));