image-js 1.5.0 → 1.6.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (56) hide show
  1. package/dist/image-js.esm.js +337 -18
  2. package/dist/image-js.esm.js.map +1 -1
  3. package/dist/image-js.esm.min.js +2 -2
  4. package/dist/image-js.esm.min.js.map +1 -1
  5. package/dist/image-js.umd.js +339 -22
  6. package/dist/image-js.umd.js.map +1 -1
  7. package/dist/image-js.umd.min.js +2 -2
  8. package/dist/image-js.umd.min.js.map +1 -1
  9. package/dist-types/image-js.d.ts +23 -2
  10. package/lib/Mask.d.ts +8 -0
  11. package/lib/Mask.d.ts.map +1 -1
  12. package/lib/Mask.js +10 -0
  13. package/lib/Mask.js.map +1 -1
  14. package/lib/load/decodePng.d.ts.map +1 -1
  15. package/lib/load/decodePng.js +26 -15
  16. package/lib/load/decodePng.js.map +1 -1
  17. package/lib/maskAnalysis/getContourMoore.d.ts +10 -0
  18. package/lib/maskAnalysis/getContourMoore.d.ts.map +1 -0
  19. package/lib/maskAnalysis/getContourMoore.js +107 -0
  20. package/lib/maskAnalysis/getContourMoore.js.map +1 -0
  21. package/lib/maskAnalysis/getContourPavlidis.d.ts +11 -0
  22. package/lib/maskAnalysis/getContourPavlidis.d.ts.map +1 -0
  23. package/lib/maskAnalysis/getContourPavlidis.js +90 -0
  24. package/lib/maskAnalysis/getContourPavlidis.js.map +1 -0
  25. package/lib/maskAnalysis/getExternalContour.d.ts +11 -0
  26. package/lib/maskAnalysis/getExternalContour.d.ts.map +1 -0
  27. package/lib/maskAnalysis/getExternalContour.js +18 -0
  28. package/lib/maskAnalysis/getExternalContour.js.map +1 -0
  29. package/lib/maskAnalysis/maskAnalysis.types.d.ts +8 -2
  30. package/lib/maskAnalysis/maskAnalysis.types.d.ts.map +1 -1
  31. package/lib/maskAnalysis/utils/getExtendedBorderPoints.d.ts.map +1 -1
  32. package/lib/maskAnalysis/utils/getExtendedBorderPoints.js +2 -4
  33. package/lib/maskAnalysis/utils/getExtendedBorderPoints.js.map +1 -1
  34. package/lib/maskAnalysis/utils/getExternalContourUtils.d.ts +17 -0
  35. package/lib/maskAnalysis/utils/getExternalContourUtils.d.ts.map +1 -0
  36. package/lib/maskAnalysis/utils/getExternalContourUtils.js +32 -0
  37. package/lib/maskAnalysis/utils/getExternalContourUtils.js.map +1 -0
  38. package/lib/roi/Roi.d.ts +7 -0
  39. package/lib/roi/Roi.d.ts.map +1 -1
  40. package/lib/roi/Roi.js +9 -0
  41. package/lib/roi/Roi.js.map +1 -1
  42. package/lib/roi/getExternalContour.d.ts +10 -0
  43. package/lib/roi/getExternalContour.d.ts.map +1 -0
  44. package/lib/roi/getExternalContour.js +11 -0
  45. package/lib/roi/getExternalContour.js.map +1 -0
  46. package/package.json +8 -5
  47. package/src/Mask.ts +12 -0
  48. package/src/load/decodePng.ts +25 -17
  49. package/src/maskAnalysis/getContourMoore.ts +143 -0
  50. package/src/maskAnalysis/getContourPavlidis.ts +102 -0
  51. package/src/maskAnalysis/getExternalContour.ts +27 -0
  52. package/src/maskAnalysis/maskAnalysis.types.ts +8 -2
  53. package/src/maskAnalysis/utils/getExtendedBorderPoints.ts +2 -4
  54. package/src/maskAnalysis/utils/getExternalContourUtils.ts +33 -0
  55. package/src/roi/Roi.ts +11 -0
  56. package/src/roi/getExternalContour.ts +17 -0
@@ -0,0 +1,32 @@
1
+ /**
2
+ * Gets point's row and column from their index and mask width.
3
+ * @param index - point's index.
4
+ * @param maskWidth - mask width.
5
+ * @returns array of point's row and column.
6
+ */
7
+ export function getCoordsFromIndex(index, maskWidth) {
8
+ return [Math.floor(index / maskWidth), index % maskWidth];
9
+ }
10
+ /**
11
+ * Safely get the bit value at the given column and row in the mask, returning 0 if out of bounds.
12
+ * @param mask - Mask to get the bit from.
13
+ * @param col - Column index.
14
+ * @param row - Row index.
15
+ * @returns the bit value.
16
+ */
17
+ export function getBitSafe(mask, col, row) {
18
+ if (!isInBounds(mask, col, row))
19
+ return 0;
20
+ return mask.getBit(col, row);
21
+ }
22
+ /**
23
+ * Checks if the given column and row are within the bounds of the mask.
24
+ * @param mask - Mask to check against.
25
+ * @param col - Column index.
26
+ * @param row - Row index.
27
+ * @returns whether the given column and row are within the bounds of the mask.
28
+ */
29
+ function isInBounds(mask, col, row) {
30
+ return col >= 0 && col < mask.width && row >= 0 && row < mask.height;
31
+ }
32
+ //# sourceMappingURL=getExternalContourUtils.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getExternalContourUtils.js","sourceRoot":"","sources":["../../../src/maskAnalysis/utils/getExternalContourUtils.ts"],"names":[],"mappings":"AACA;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAAC,KAAa,EAAE,SAAiB;IACjE,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC,CAAC;AAC5D,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,UAAU,CAAC,IAAU,EAAE,GAAW,EAAE,GAAW;IAC7D,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC;QAAE,OAAO,CAAC,CAAC;IAC1C,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;GAMG;AACH,SAAS,UAAU,CAAC,IAAU,EAAE,GAAW,EAAE,GAAW;IACtD,OAAO,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;AACvE,CAAC"}
package/lib/roi/Roi.d.ts CHANGED
@@ -1,4 +1,5 @@
1
1
  import type { Mask } from '../Mask.js';
2
+ import type { GetExternalContourOptions } from '../maskAnalysis/getExternalContour.ts';
2
3
  import type { Feret, GetBorderPointsOptions, Mbr } from '../maskAnalysis/index.js';
3
4
  import type { Point } from '../utils/geometry/points.js';
4
5
  import type { RoiMap } from './RoiMapManager.js';
@@ -62,6 +63,12 @@ export declare class Roi {
62
63
  * @returns The array of border pixels.
63
64
  */
64
65
  getBorderPoints(options?: GetBorderPointsOptions): Point[];
66
+ /**
67
+ * Finds external contour of the roi from its mask.
68
+ * @param options - GetExternalContourOptions.
69
+ * @returns Array of contour points.
70
+ */
71
+ getExternalContour(options?: GetExternalContourOptions): Point[];
65
72
  /**
66
73
  * Returns an array of ROIs IDs that are included in the current ROI.
67
74
  * This will be useful to know if there are some holes in the ROI.
@@ -1 +1 @@
1
- {"version":3,"file":"Roi.d.ts","sourceRoot":"","sources":["../../src/roi/Roi.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EACV,KAAK,EACL,sBAAsB,EACtB,GAAG,EACJ,MAAM,0BAA0B,CAAC;AAClC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAEzD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AAGnD,OAAO,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAC;AAuBtD,qBAAa,GAAG;;IACd;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAS;IAC7B;;OAEG;IACH,SAAgB,EAAE,EAAE,MAAM,CAAC;IAC3B;;;OAGG;IACH,SAAgB,MAAM,EAAE,KAAK,CAAC;IAC9B;;OAEG;IACH,SAAgB,KAAK,EAAE,MAAM,CAAC;IAC9B;;OAEG;IACH,SAAgB,MAAM,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,SAAgB,OAAO,EAAE,MAAM,CAAC;gBAO9B,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,KAAK,EACb,OAAO,EAAE,MAAM;IAUjB;;;;;OAKG;IACI,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM;IAI9C;;;OAGG;IACI,QAAQ,IAAI,MAAM;IAIzB;;;;OAIG;IACI,OAAO,CAAC,OAAO,CAAC,EAAE,cAAc,GAAG,IAAI;IAI9C;;;OAGG;IACH,IAAI,GAAG,WAEN;IAED;;;;;OAKG;IACI,eAAe,CAAC,OAAO,CAAC,EAAE,sBAAsB,GAAG,KAAK,EAAE;IAIjE;;;;OAIG;IACH,IAAI,WAAW,aAyCd;IAED;;;OAGG;IACH,IAAI,eAAe,IAAI,MAAM,EAAE,CAsB9B;IAED;;;OAGG;IACH,IAAI,aAAa;aA9LK,MAAM;aAAO,MAAM;eAAS,MAAM;cAAQ,MAAM;MA2PrE;IAED;;;;;;OAMG;IAEH,IAAI,SAAS,WAUZ;IACD;;;OAGG;IACH,IAAI,cAAc,YAKjB;IACD;;;OAGG;IACH,IAAI,cAAc,YAKjB;IAED,IAAI,MAAM,aAuDT;IAED;;;;OAIG;IACH,IAAI,IAAI,WAEP;IACD;;;OAGG;IACH,IAAI,OAAO,IAAI,OAAO,CAIrB;IAED;;;;OAIG;IACH,IAAI,SAAS;gBA/WQ,MAAM;iBAAW,MAAM;MAmY3C;IAED;;;OAGG;IACH,IAAI,OAAO,aAgEV;IACD;;;OAGG;IACH,IAAI,SAAS,WAEZ;IACD;;;;OAIG;IACH,IAAI,UAAU,WAEb;IACD;;;OAGG;IACH,IAAI,aAAa,WAEhB;IAED;;;;OAIG;IACH,IAAI,QAAQ,WAEX;IAGD;;;;OAIG;IACH,IAAI,UAAU;gBA5eQ,KAAK,EAAE;iBAAW,MAAM;mBAAa,MAAM;MAgfhE;IACD;;;;OAIG;IACH,IAAI,GAAG,QAIN;IAMD,IAAI,SAAS,WAEZ;IACD;;;;;OAKG;IAEH,IAAI,KAAK,IAAI,KAAK,CAIjB;IACD;;;OAGG;IACH,MAAM;;;;;;;;;;;;;;;oBAnhBgB,KAAK,EAAE;qBAAW,MAAM;uBAAa,MAAM;;;;;;IAwiBjE;;;OAGG;IACH,IAAI,QAAQ,UAqBX;IA2BD;;;;OAIG;IACF,MAAM,CAAC,QAAQ,EAAE,OAAO;;;;CAoB1B"}
1
+ {"version":3,"file":"Roi.d.ts","sourceRoot":"","sources":["../../src/roi/Roi.ts"],"names":[],"mappings":"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"}
package/lib/roi/Roi.js CHANGED
@@ -2,6 +2,7 @@ import { getConvexHull } from '../maskAnalysis/getConvexHull.js';
2
2
  import { getFeret } from '../maskAnalysis/getFeret.js';
3
3
  import { getMbr } from '../maskAnalysis/getMbr.js';
4
4
  import { getBorderPoints } from './getBorderPoints.js';
5
+ import { getExternalContour } from "./getExternalContour.js";
5
6
  import { getMask } from './getMask.js';
6
7
  import { getEllipse } from './properties/getEllipse.js';
7
8
  export class Roi {
@@ -83,6 +84,14 @@ export class Roi {
83
84
  getBorderPoints(options) {
84
85
  return getBorderPoints(this, options);
85
86
  }
87
+ /**
88
+ * Finds external contour of the roi from its mask.
89
+ * @param options - GetExternalContourOptions.
90
+ * @returns Array of contour points.
91
+ */
92
+ getExternalContour(options) {
93
+ return getExternalContour(this, options);
94
+ }
86
95
  /**
87
96
  * Returns an array of ROIs IDs that are included in the current ROI.
88
97
  * This will be useful to know if there are some holes in the ROI.
@@ -1 +1 @@
1
- {"version":3,"file":"Roi.js","sourceRoot":"","sources":["../../src/roi/Roi.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Roi.js","sourceRoot":"","sources":["../../src/roi/Roi.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,10 @@
1
+ import type { GetExternalContourOptions } from '../maskAnalysis/getExternalContour.ts';
2
+ import type { Roi } from './Roi.ts';
3
+ /**
4
+ * Finds external contour of the roi from its mask.
5
+ * @param roi - roi to find contour from.
6
+ * @param options - GetExternalContourOptions.
7
+ * @returns Array of contour points.
8
+ */
9
+ export declare function getExternalContour(roi: Roi, options?: GetExternalContourOptions): import("../index_full.ts").Point[];
10
+ //# sourceMappingURL=getExternalContour.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getExternalContour.d.ts","sourceRoot":"","sources":["../../src/roi/getExternalContour.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,uCAAuC,CAAC;AAEvF,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,UAAU,CAAC;AAEpC;;;;;GAKG;AACH,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,GAAG,EACR,OAAO,CAAC,EAAE,yBAAyB,sCAIpC"}
@@ -0,0 +1,11 @@
1
+ /**
2
+ * Finds external contour of the roi from its mask.
3
+ * @param roi - roi to find contour from.
4
+ * @param options - GetExternalContourOptions.
5
+ * @returns Array of contour points.
6
+ */
7
+ export function getExternalContour(roi, options) {
8
+ const mask = roi.getMask();
9
+ return mask.getExternalContour(options);
10
+ }
11
+ //# sourceMappingURL=getExternalContour.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"getExternalContour.js","sourceRoot":"","sources":["../../src/roi/getExternalContour.ts"],"names":[],"mappings":"AAIA;;;;;GAKG;AACH,MAAM,UAAU,kBAAkB,CAChC,GAAQ,EACR,OAAmC;IAEnC,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC3B,OAAO,IAAI,CAAC,kBAAkB,CAAC,OAAO,CAAC,CAAC;AAC1C,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "image-js",
3
- "version": "1.5.0",
3
+ "version": "1.6.1",
4
4
  "license": "MIT",
5
5
  "description": "Image processing and manipulation in JavaScript",
6
6
  "author": "Michaël Zasso",
@@ -63,16 +63,19 @@
63
63
  "optionalDependencies": {
64
64
  "skia-canvas": "^3.0.8"
65
65
  },
66
+ "overrides": {
67
+ "yargs": "^18.0.0"
68
+ },
66
69
  "lavamoat": {
67
70
  "allowScripts": {
68
71
  "@lavamoat/preinstall-always-fail": false,
69
- "skia-canvas": true,
70
- "vite>esbuild": false
72
+ "vite>esbuild": false,
73
+ "skia-canvas#3.0.8": true
71
74
  }
72
75
  },
73
76
  "devDependencies": {
74
- "@lavamoat/allow-scripts": "^3.4.1",
75
- "@lavamoat/preinstall-always-fail": "^2.1.1",
77
+ "@lavamoat/allow-scripts": "^5.0.2",
78
+ "@lavamoat/preinstall-always-fail": "^3.0.0",
76
79
  "@microsoft/api-extractor": "^7.55.2",
77
80
  "@tailwindcss/forms": "^0.5.11",
78
81
  "@tailwindcss/vite": "^4.1.18",
package/src/Mask.ts CHANGED
@@ -19,6 +19,8 @@ import type { AndOptions, InvertOptions, OrOptions } from './filters/index.js';
19
19
  import { and, invert, or } from './filters/index.js';
20
20
  import { getBorderPoints } from './maskAnalysis/getBorderPoints.js';
21
21
  import { getConvexHull } from './maskAnalysis/getConvexHull.js';
22
+ import type { GetExternalContourOptions } from './maskAnalysis/getExternalContour.ts';
23
+ import { getExternalContour } from './maskAnalysis/getExternalContour.ts';
22
24
  import { getFeret } from './maskAnalysis/getFeret.js';
23
25
  import { getMbr } from './maskAnalysis/getMbr.js';
24
26
  import type {
@@ -503,6 +505,16 @@ export class Mask {
503
505
  return getBorderPoints(this, options);
504
506
  }
505
507
 
508
+ /**
509
+ * Returns external contour of the mask. Unlike border points, returned points
510
+ * follow the shape of the mask.
511
+ * @param options - Get external contour options.
512
+ * @returns Array of contour points.
513
+ */
514
+ public getExternalContour(options?: GetExternalContourOptions) {
515
+ return getExternalContour(this, options);
516
+ }
517
+
506
518
  /**
507
519
  * Get the vertices of the convex Hull polygon of a mask.
508
520
  * @returns Array of the vertices of the convex Hull in clockwise order.
@@ -43,22 +43,7 @@ export function decodePng(buffer: Uint8Array): Image {
43
43
  default:
44
44
  throw new RangeError(`invalid number of channels: ${png.channels}`);
45
45
  }
46
- let resolution: Resolution | undefined;
47
- if (png.resolution) {
48
- resolution =
49
- png.resolution.unit === 1
50
- ? /*If the resolution unit is meters*/ {
51
- x: png.resolution.x,
52
- y: png.resolution.y,
53
- unit: 'meter' as const,
54
- }
55
- : /*If resolution unit is unknown */ {
56
- x: png.resolution.x,
57
- y: png.resolution.y,
58
- unit: 'unknown' as const,
59
- };
60
- }
61
-
46
+ const resolution = getResolution(png);
62
47
  return new Image(png.width, png.height, {
63
48
  colorModel,
64
49
  bitDepth,
@@ -94,10 +79,11 @@ function loadPalettePng(png: DecodedPng): Image {
94
79
  data[dataIndex++] = paletteChannel;
95
80
  }
96
81
  }
97
-
82
+ const resolution = getResolution(png);
98
83
  return new Image(png.width, png.height, {
99
84
  data,
100
85
  colorModel: png.palette[0].length === 4 ? 'RGBA' : 'RGB',
86
+ resolution,
101
87
  });
102
88
  }
103
89
 
@@ -126,3 +112,25 @@ function decodeBinary(png: DecodedPng): Uint8Array {
126
112
  }
127
113
  return result;
128
114
  }
115
+ /**
116
+ * Gets image's resolution from its parsed data.
117
+ * @param png - Parsed .png image.
118
+ * @returns Object with resolution data if exists.
119
+ */
120
+ function getResolution(png: DecodedPng): Resolution | undefined {
121
+ if (png.resolution) {
122
+ return png.resolution.unit === 1
123
+ ? /*If the resolution unit is meters*/ {
124
+ x: png.resolution.x,
125
+ y: png.resolution.y,
126
+ unit: 'meter' as const,
127
+ }
128
+ : /*If resolution unit is unknown */ {
129
+ x: png.resolution.x,
130
+ y: png.resolution.y,
131
+ unit: 'unknown' as const,
132
+ };
133
+ } else {
134
+ return undefined;
135
+ }
136
+ }
@@ -0,0 +1,143 @@
1
+ import assert from 'node:assert';
2
+
3
+ import type { Mask } from '../Mask.ts';
4
+ import type { Point } from '../utils/geometry/points.ts';
5
+
6
+ import {
7
+ getBitSafe,
8
+ getCoordsFromIndex,
9
+ } from './utils/getExternalContourUtils.ts';
10
+
11
+ interface Direction {
12
+ /**
13
+ * Horizontal direction change.
14
+ */
15
+ dc: number;
16
+ /**
17
+ * Vertical direction change.
18
+ */
19
+ dr: number;
20
+ }
21
+ /**
22
+ * Possible directions.
23
+ */
24
+ const directions: Direction[] = [
25
+ { dc: -1, dr: 0 }, // left
26
+ { dc: -1, dr: -1 }, // up-left
27
+ { dc: 0, dr: -1 }, // up
28
+ { dc: 1, dr: -1 }, // up-right
29
+ { dc: 1, dr: 0 }, // right
30
+ { dc: 1, dr: 1 }, // down-right
31
+ { dc: 0, dr: 1 }, // down
32
+ { dc: -1, dr: 1 }, // down-left
33
+ ];
34
+ // Lookup table for directions' index.
35
+ const directionIndexLookup = new Int8Array(9).fill(-1);
36
+ for (let i = 0; i < directions.length; i++) {
37
+ const { dc, dr } = directions[i];
38
+ directionIndexLookup[(dr + 1) * 3 + (dc + 1)] = i;
39
+ }
40
+ /**
41
+ * Return an array with the coordinates of the pixels that are on the border of the mask using Moore's tracing algorithm.
42
+ * The reference is the top-left corner of the ROI.
43
+ * @param mask - Mask to process.
44
+ * @returns The array of border pixels.
45
+ */
46
+ export function getContourMoore(mask: Mask): Point[] {
47
+ let index = 0;
48
+
49
+ const contour: Point[] = [];
50
+ const visited = new Uint8Array(mask.width * mask.height);
51
+ while (mask.getBitByIndex(index) !== 1 && index !== mask.size) {
52
+ index++;
53
+ }
54
+
55
+ if (index === mask.size) return contour;
56
+ const [row, col] = getCoordsFromIndex(index, mask.width);
57
+ const startingPoint = { column: col, row };
58
+ let currentPoint = startingPoint;
59
+
60
+ visited[index] = 1;
61
+ contour.push(currentPoint);
62
+
63
+ const firstNext = findNextPoint(mask, currentPoint, { column: col - 1, row });
64
+ if (!firstNext) {
65
+ return contour;
66
+ }
67
+
68
+ let startingBacktrackPoint: Point = firstNext.prevPoint;
69
+
70
+ let backtrackPoint = firstNext.prevPoint;
71
+ currentPoint = firstNext.currPoint;
72
+
73
+ while (true) {
74
+ index = currentPoint.row * mask.width + currentPoint.column;
75
+ if (!visited[index]) {
76
+ visited[index] = 1;
77
+ contour.push(currentPoint);
78
+ }
79
+
80
+ const next = findNextPoint(mask, currentPoint, backtrackPoint);
81
+ assert.ok(next, 'Next border point is undefined.');
82
+ backtrackPoint = next.prevPoint;
83
+ currentPoint = next.currPoint;
84
+ if (
85
+ currentPoint.column === startingPoint.column &&
86
+ currentPoint.row === startingPoint.row
87
+ ) {
88
+ if (
89
+ backtrackPoint.column === startingBacktrackPoint.column &&
90
+ backtrackPoint.row === startingBacktrackPoint.row
91
+ ) {
92
+ break;
93
+ } else {
94
+ startingBacktrackPoint = backtrackPoint;
95
+ }
96
+ }
97
+ }
98
+
99
+ return contour;
100
+ }
101
+ /**
102
+ * Finds next point to trace.
103
+ * @param mask - Mask in check.
104
+ * @param current - Current border point.
105
+ * @param previous - Last non-border point to start search from.
106
+ * @returns Object with new border point and last non-border point.
107
+ */
108
+ function findNextPoint(
109
+ mask: Mask,
110
+ current: Point,
111
+ previous: Point,
112
+ ): { prevPoint: Point; currPoint: Point } | undefined {
113
+ let prevPoint = previous;
114
+
115
+ // Vector from current back to previous
116
+ const backDc = previous.column - current.column;
117
+ const backDr = previous.row - current.row;
118
+
119
+ const startIndex = directionIndexLookup[(backDr + 1) * 3 + (backDc + 1)];
120
+
121
+ // Scan clockwise starting from that index.
122
+ for (let i = 0; i < directions.length; i++) {
123
+ const { dc, dr } = directions.at(
124
+ (startIndex + i) % directions.length,
125
+ ) as Direction;
126
+ const newCol = current.column + dc;
127
+ const newRow = current.row + dr;
128
+ if (getBitSafe(mask, newCol, newRow) === 1) {
129
+ // Stores found border point and last non-border point that
130
+ // was found. Will be used as a starting point in the next
131
+ // iteration.
132
+ return {
133
+ prevPoint,
134
+ currPoint: { column: newCol, row: newRow },
135
+ };
136
+ } else {
137
+ prevPoint = { column: newCol, row: newRow };
138
+ }
139
+ }
140
+ // Is triggered only if the point has no neighbours. So it is undefined
141
+ // only if mask is made of one pixel.
142
+ return undefined;
143
+ }
@@ -0,0 +1,102 @@
1
+ import type { Mask } from '../Mask.ts';
2
+ import type { Point } from '../utils/geometry/points.ts';
3
+
4
+ import {
5
+ getBitSafe,
6
+ getCoordsFromIndex,
7
+ } from './utils/getExternalContourUtils.ts';
8
+
9
+ type Direction = 0 | 1 | 2 | 3; // N, E, S, W
10
+
11
+ const DR = [-1, 0, 1, 0];
12
+ const DC = [0, 1, 0, -1];
13
+
14
+ function turnLeft(d: Direction): Direction {
15
+ return ((d + 3) % 4) as Direction;
16
+ }
17
+
18
+ function turnRight(d: Direction): Direction {
19
+ return ((d + 1) % 4) as Direction;
20
+ }
21
+
22
+ /**
23
+ * Return an array with the coordinates of the pixels that are on the
24
+ * external border of the mask using Theo Pavlidis's tracing algorithm.
25
+ * The reference is the top-left corner of the ROI.
26
+ * @param mask - Mask to process.
27
+ * @returns The array of external border pixels.
28
+ */
29
+ export function getContourPavlidis(mask: Mask): Point[] {
30
+ let index = 0;
31
+ while (index < mask.size && mask.getBitByIndex(index) !== 1) {
32
+ index++;
33
+ }
34
+ if (index === mask.size) return [];
35
+ const [row, col] = getCoordsFromIndex(index, mask.width);
36
+
37
+ return traceFrom(mask, col, row);
38
+ }
39
+
40
+ /**
41
+ * Traces contour using Pavlidis algorithm.
42
+ * @param mask - Mask in check.
43
+ * @param startCol - Starting column.
44
+ * @param startRow - Starting row.
45
+ * @returns Array of contour points.
46
+ */
47
+ function traceFrom(mask: Mask, startCol: number, startRow: number): Point[] {
48
+ let row = startRow;
49
+ let column = startCol;
50
+ let dir: Direction = 2;
51
+ let inPlaceTurns = 0;
52
+ const seen = new Uint8Array(mask.width * mask.height);
53
+ const contour: Point[] = [];
54
+ let visits = 0;
55
+ while (true) {
56
+ const idx = row * mask.width + column;
57
+ if (!seen[idx]) {
58
+ seen[idx] = 1;
59
+ contour.push({ row, column });
60
+ } else if (row === startRow && column === startCol) {
61
+ if (visits === 2) {
62
+ break;
63
+ } else {
64
+ visits++;
65
+ }
66
+ }
67
+
68
+ const left = turnLeft(dir);
69
+ const right = turnRight(dir);
70
+
71
+ const c1r = row + DR[left];
72
+ const c1c = column + DC[left];
73
+
74
+ const c2r = row + DR[dir];
75
+ const c2c = column + DC[dir];
76
+
77
+ const c3r = row + DR[right];
78
+ const c3c = column + DC[right];
79
+
80
+ if (getBitSafe(mask, c1c, c1r) === 1) {
81
+ dir = left;
82
+ row = c1r;
83
+ column = c1c;
84
+ inPlaceTurns = 0;
85
+ } else if (getBitSafe(mask, c2c, c2r) === 1) {
86
+ row = c2r;
87
+ column = c2c;
88
+ inPlaceTurns = 0;
89
+ } else if (getBitSafe(mask, c3c, c3r) === 1) {
90
+ dir = right;
91
+ row = c3r;
92
+ column = c3c;
93
+ inPlaceTurns = 0;
94
+ } else {
95
+ dir = right;
96
+ inPlaceTurns++;
97
+ if (inPlaceTurns >= 4) break;
98
+ }
99
+ }
100
+
101
+ return contour;
102
+ }
@@ -0,0 +1,27 @@
1
+ import type { Mask } from '../Mask.ts';
2
+
3
+ import { getContourMoore } from './getContourMoore.ts';
4
+ import { getContourPavlidis } from './getContourPavlidis.ts';
5
+ import type { GetBorderPointsOptions } from './maskAnalysis.types.ts';
6
+
7
+ export type GetExternalContourOptions = Omit<
8
+ GetBorderPointsOptions,
9
+ 'innerBorers'
10
+ >;
11
+ /**
12
+ * Finds external contour of the mask.
13
+ * @param mask - Mask to find contours from.
14
+ * @param options - GetExternalContourOptions.
15
+ * @returns Array of contour points.
16
+ */
17
+ export function getExternalContour(
18
+ mask: Mask,
19
+ options: GetExternalContourOptions = {},
20
+ ) {
21
+ const { allowCorners = false } = options;
22
+ if (allowCorners) {
23
+ return getContourPavlidis(mask);
24
+ } else {
25
+ return getContourMoore(mask);
26
+ }
27
+ }
@@ -70,12 +70,18 @@ export interface Mbr {
70
70
 
71
71
  export interface GetBorderPointsOptions {
72
72
  /**
73
- * Should the inner borders be returned too?
73
+ * Whether to include borders around holes inside the mask.
74
+ * When `false`, the mask is solid-filled before processing, so only the outer contour is returned.
75
+ * When `true`, pixels bordering interior holes are returned as well.
74
76
  * @default `false`
75
77
  */
76
78
  innerBorders?: boolean;
77
79
  /**
78
- * Consider pixels connected by corners?
80
+ * Whether to use 8-connectivity instead of 4-connectivity when detecting border pixels.
81
+ * When `false`, a pixel is considered a border only if at least one of its 4 orthogonal
82
+ * neighbors (up, down, left, right) is unset.
83
+ * When `true`, diagonal neighbors are also considered, so a pixel touching an unset pixel
84
+ * only by a corner is also returned as a border point.
79
85
  * @default `false`
80
86
  */
81
87
  allowCorners?: boolean;
@@ -1,5 +1,6 @@
1
1
  import type { Mask } from '../../Mask.js';
2
2
  import type { Point } from '../../utils/geometry/points.js';
3
+ import { getExternalContour } from '../getExternalContour.ts';
3
4
 
4
5
  /**
5
6
  * Get the pixels that surround an ROI. The pixels include the top and left borders,
@@ -10,10 +11,7 @@ import type { Point } from '../../utils/geometry/points.js';
10
11
  * @returns - The array of points.
11
12
  */
12
13
  export function getExtendedBorderPoints(mask: Mask): Point[] {
13
- const borderPoints = mask.getBorderPoints({
14
- allowCorners: true,
15
- innerBorders: false,
16
- });
14
+ const borderPoints = getExternalContour(mask);
17
15
 
18
16
  const result: Point[] = [];
19
17