image-js 0.32.0 → 0.33.2

package/index.d.ts

@@ -149,7 +149,11 @@ export declare class Image {
   // paintPoints
   // paintPolyline
   // paintPolylines
-  // paintPolygon
+  paintPolygon(points: Array<Array<number>>, options?: {
+    color?: Array<number>;
+    filled?: boolean;
+  }): Image;
+
   // paintPolygons
 
   // countAlphaPixels

package/lib/browser/environment.js

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.ImageData = exports.DOMImage = void 0;
 exports.createCanvas = createCanvas;
-exports.fetchBinary = fetchBinary;
 exports.createWriteStream = createWriteStream;
+exports.env = void 0;
+exports.fetchBinary = fetchBinary;
 exports.writeFile = writeFile;
-exports.DOMImage = exports.ImageData = exports.env = void 0;
 const env = 'browser';
 exports.env = env;
 const ImageData = self.ImageData;

package/lib/image/compute/extendedPoints.js

@@ -8,6 +8,7 @@ exports.default = extendedPoints;
 /**
  * Allows to generate an array of points for a binary image (bit depth = 1)
  * The points consider the beginning and the end of each pixel
+ * This method is only used to calculate minimalBoundRectangle
  * @memberof Image
  * @instance
  * @return {Array<Array<number>>} - an array of [x,y] corresponding to the set pixels in the binary image
@@ -35,6 +36,11 @@ function extendedPoints() {
             pixels.push([x, y + 1]);
             pixels.push([x + 1, y + 1]);
           }
+        } // this small optimization allows to reduce dramatically the number of points for MBR calculation
+
+
+        while (x < this.width - 2 && this.getBitXY(x + 1, y) === 1 && this.getBitXY(x + 2, y) === 1) {
+          x++;
         }
       }
     }

package/lib/image/core/environment.js

@@ -3,20 +3,21 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.fetchBinary = fetchBinary;
+exports.createCanvas = exports.ImageData = exports.DOMImage = void 0;
 Object.defineProperty(exports, "createWriteStream", {
   enumerable: true,
   get: function () {
     return _fs.createWriteStream;
   }
 });
+exports.env = void 0;
+exports.fetchBinary = fetchBinary;
 Object.defineProperty(exports, "writeFile", {
   enumerable: true,
   get: function () {
     return _fs.writeFile;
   }
 });
-exports.DOMImage = exports.ImageData = exports.createCanvas = exports.env = void 0;
 
 var _fs = require("fs");
 

package/lib/image/core/kind.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.createPixelArray = createPixelArray;
 exports.getKind = getKind;
-exports.verifyKindDefinition = verifyKindDefinition;
 exports.getTheoreticalPixelArraySize = getTheoreticalPixelArraySize;
-exports.createPixelArray = createPixelArray;
+exports.verifyKindDefinition = verifyKindDefinition;
 
 var ColorModel = _interopRequireWildcard(require("../model/model"));
 

package/lib/image/core/kindNames.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CMYKA = exports.CMYK = exports.RGBA = exports.RGB = exports.GREYA = exports.GREY = exports.BINARY = void 0;
+exports.RGBA = exports.RGB = exports.GREYA = exports.GREY = exports.CMYKA = exports.CMYK = exports.BINARY = void 0;
 // Shortcuts for common image kinds
 const BINARY = 'BINARY';
 exports.BINARY = BINARY;

package/lib/image/internal/checks.js

@@ -3,10 +3,10 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.checkRow = checkRow;
-exports.checkColumn = checkColumn;
 exports.checkChannel = checkChannel;
+exports.checkColumn = checkColumn;
 exports.checkInterpolation = checkInterpolation;
+exports.checkRow = checkRow;
 exports.validInterpolations = void 0;
 
 function checkRow(image, row) {

package/lib/image/model/model.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CMYK = exports.HSV = exports.HSL = exports.RGB = exports.GREY = void 0;
+exports.RGB = exports.HSV = exports.HSL = exports.GREY = exports.CMYK = void 0;
 
 /**
  * Color model of an image

package/lib/image/utility/getMatrix.js

@@ -5,9 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = getMatrix;
 
-var _mlMatrix = _interopRequireDefault(require("ml-matrix"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _mlMatrix = require("ml-matrix");
 
 /**
  * @memberof Image
@@ -32,7 +30,7 @@ function getMatrix(options = {}) {
     channel = 0;
   }
 
-  let matrix = new _mlMatrix.default(this.height, this.width);
+  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++) {

package/lib/index.js

@@ -3,16 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-Object.defineProperty(exports, "default", {
+Object.defineProperty(exports, "Image", {
   enumerable: true,
   get: function () {
     return _Image.default;
   }
 });
-Object.defineProperty(exports, "Image", {
+exports.Kernel = void 0;
+Object.defineProperty(exports, "Shape", {
   enumerable: true,
   get: function () {
-    return _Image.default;
+    return _Shape.default;
   }
 });
 Object.defineProperty(exports, "Stack", {
@@ -21,19 +22,19 @@ Object.defineProperty(exports, "Stack", {
     return _Stack.default;
   }
 });
-Object.defineProperty(exports, "Shape", {
+exports.Static = void 0;
+Object.defineProperty(exports, "Worker", {
   enumerable: true,
   get: function () {
-    return _Shape.default;
+    return _worker.default;
   }
 });
-Object.defineProperty(exports, "Worker", {
+Object.defineProperty(exports, "default", {
   enumerable: true,
   get: function () {
-    return _worker.default;
+    return _Image.default;
   }
 });
-exports.Kernel = exports.Static = void 0;
 
 var _Image = _interopRequireDefault(require("./image/Image"));
 

package/lib/util/base64.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.encode = encode;
 exports.decode = decode;
+exports.encode = encode;
 exports.toBase64URL = toBase64URL;
 
 /*

package/lib/util/color.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.css2array = css2array;
+exports.getColors = getColors;
 exports.getDistinctColors = getDistinctColors;
 exports.getRandomColor = getRandomColor;
-exports.getColors = getColors;
 
 var _colorFns = require("@swiftcarrot/color-fns");
 

package/lib/util/converter.js

@@ -3,9 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.factorDimensions = factorDimensions;
 exports.getFactor = getFactor;
 exports.getThreshold = getThreshold;
-exports.factorDimensions = factorDimensions;
 
 /**
  * Converts a factor value to a number between 0 and 1

package/lib/util/histogram.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.median = median;
 exports.mean = mean;
+exports.median = median;
 
 /**
  * Returns the median of an histogram

package/lib/util/kernels.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.SECOND_DERIVATIVE_INV = exports.SECOND_DERIVATIVE = exports.SCHARR_Y = exports.SCHARR_X = exports.SOBEL_Y = exports.SOBEL_X = exports.DISCRETE_LAPLACE_8 = exports.DISCRETE_LAPLACE_4 = void 0;
+exports.SOBEL_Y = exports.SOBEL_X = exports.SECOND_DERIVATIVE_INV = exports.SECOND_DERIVATIVE = exports.SCHARR_Y = exports.SCHARR_X = exports.DISCRETE_LAPLACE_8 = exports.DISCRETE_LAPLACE_4 = void 0;
 const DISCRETE_LAPLACE_4 = [[0, 1, 0], [1, -4, 1], [0, 1, 0]];
 exports.DISCRETE_LAPLACE_4 = DISCRETE_LAPLACE_4;
 const DISCRETE_LAPLACE_8 = [[1, 1, 1], [1, -8, 1], [1, 1, 1]];

package/lib/util/points.js

@@ -3,17 +3,17 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.round = round;
-exports.difference = difference;
-exports.normalize = normalize;
-exports.rotate = rotate;
-exports.dot = dot;
 exports.angle = angle;
 exports.boundary = boundary;
-exports.perimeter = perimeter;
-exports.surface = surface;
+exports.difference = difference;
+exports.dot = dot;
 exports.minMax = minMax;
 exports.moveToZeroZero = moveToZeroZero;
+exports.normalize = normalize;
+exports.perimeter = perimeter;
+exports.rotate = rotate;
+exports.round = round;
+exports.surface = surface;
 
 /**
  * Rounds all the x and y values of an array of points

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "image-js",
-  "version": "0.32.0",
+  "version": "0.33.2",
   "description": "Image processing and manipulation in JavaScript",
   "keywords": [
     "image",
@@ -59,21 +59,21 @@
     ]
   },
   "devDependencies": {
-    "@babel/cli": "^7.14.5",
-    "@babel/core": "^7.14.6",
-    "@babel/plugin-transform-block-scoping": "^7.14.5",
-    "@babel/plugin-transform-modules-commonjs": "^7.14.5",
-    "@babel/preset-env": "^7.14.7",
-    "@types/jest": "^26.0.23",
+    "@babel/cli": "^7.16.0",
+    "@babel/core": "^7.16.0",
+    "@babel/plugin-transform-block-scoping": "^7.16.0",
+    "@babel/plugin-transform-modules-commonjs": "^7.16.0",
+    "@babel/preset-env": "^7.16.0",
+    "@types/jest": "^27.0.2",
     "benchmark": "^2.1.4",
     "cheminfo-build": "^1.1.11",
     "cross-env": "^7.0.3",
-    "eslint": "^7.30.0",
-    "eslint-config-cheminfo": "^5.2.4",
+    "eslint": "^8.1.0",
+    "eslint-config-cheminfo": "^7.1.2",
     "esm": "^3.2.25",
-    "jest": "^27.0.6",
-    "jest-matcher-deep-close-to": "^2.0.1",
-    "prettier": "^2.3.2",
+    "jest": "^27.3.1",
+    "jest-matcher-deep-close-to": "^3.0.2",
+    "prettier": "^2.4.1",
     "rimraf": "^3.0.2",
     "sha.js": "^2.4.11"
   },
@@ -84,7 +84,7 @@
     "fast-bmp": "^1.0.0",
     "fast-jpeg": "^1.0.1",
     "fast-list": "^1.0.3",
-    "fast-png": "^5.0.4",
+    "fast-png": "^6.1.0",
     "has-own": "^1.0.1",
     "image-type": "^4.1.0",
     "is-array-type": "^1.0.0",
@@ -101,7 +101,7 @@
     "monotone-chain-convex-hull": "^1.0.0",
     "new-array": "^1.0.0",
     "robust-point-in-polygon": "^1.0.3",
-    "tiff": "^5.0.0",
+    "tiff": "^5.0.2",
     "web-worker-manager": "^0.2.0"
   },
   "engines": {

package/src/image/compute/extendedPoints.js

@@ -1,6 +1,7 @@
 /**
  * Allows to generate an array of points for a binary image (bit depth = 1)
  * The points consider the beginning and the end of each pixel
+ * This method is only used to calculate minimalBoundRectangle
  * @memberof Image
  * @instance
  * @return {Array<Array<number>>} - an array of [x,y] corresponding to the set pixels in the binary image
@@ -15,6 +16,7 @@ export default function extendedPoints() {
     for (let x = 0; x < this.width; x++) {
       if (this.getBitXY(x, y) === 1) {
         pixels.push([x, y]);
+
         if (this.getBitXY(x + 1, y) !== 1) {
           pixels.push([x + 1, y]);
           pixels.push([x + 1, y + 1]);
@@ -27,6 +29,15 @@ export default function extendedPoints() {
             pixels.push([x + 1, y + 1]);
           }
         }
+
+        // this small optimization allows to reduce dramatically the number of points for MBR calculation
+        while (
+          x < this.width - 2 &&
+          this.getBitXY(x + 1, y) === 1 &&
+          this.getBitXY(x + 2, y) === 1
+        ) {
+          x++;
+        }
       }
     }
   }

package/src/image/utility/getMatrix.js

@@ -1,4 +1,4 @@
-import Matrix from 'ml-matrix';
+import { Matrix } from 'ml-matrix';
 
 /**
  * @memberof Image