image-js 1.6.0 → 1.6.2
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.
- package/dist/image-js.esm.js +48 -19
- package/dist/image-js.esm.js.map +1 -1
- package/dist/image-js.esm.min.js +2 -2
- package/dist/image-js.esm.min.js.map +1 -1
- package/dist/image-js.umd.js +52 -21
- package/dist/image-js.umd.js.map +1 -1
- package/dist/image-js.umd.min.js +2 -2
- package/dist/image-js.umd.min.js.map +1 -1
- package/dist-types/image-js.d.ts +2 -4
- package/lib/Stack.d.ts +1 -2
- package/lib/Stack.d.ts.map +1 -1
- package/lib/Stack.js.map +1 -1
- package/lib/align/affineTransfrom/getAffineTransform.d.ts +1 -2
- package/lib/align/affineTransfrom/getAffineTransform.d.ts.map +1 -1
- package/lib/align/affineTransfrom/getAffineTransform.js +4 -1
- package/lib/align/affineTransfrom/getAffineTransform.js.map +1 -1
- package/lib/load/decodeBmp.d.ts.map +1 -1
- package/lib/load/decodeBmp.js +17 -0
- package/lib/load/decodeBmp.js.map +1 -1
- package/lib/load/decodePng.d.ts.map +1 -1
- package/lib/load/decodePng.js +26 -15
- package/lib/load/decodePng.js.map +1 -1
- package/lib/maskAnalysis/getContourMoore.d.ts.map +1 -1
- package/lib/maskAnalysis/getContourMoore.js +2 -2
- package/lib/maskAnalysis/getContourMoore.js.map +1 -1
- package/package.json +8 -5
- package/src/Stack.ts +1 -3
- package/src/align/affineTransfrom/getAffineTransform.ts +5 -3
- package/src/load/decodeBmp.ts +22 -0
- package/src/load/decodePng.ts +25 -17
- package/src/maskAnalysis/getContourMoore.ts +2 -3
package/dist-types/image-js.d.ts
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import type { BitDepth as BitDepth_2 } from 'fast-png';
|
|
2
1
|
import { decode as decode_2 } from 'tiff';
|
|
3
2
|
import type { PngEncoderOptions } from 'fast-png';
|
|
4
3
|
|
|
@@ -1444,9 +1443,8 @@ export declare interface GetAffineTransformOptions {
|
|
|
1444
1443
|
debug?: boolean;
|
|
1445
1444
|
/**
|
|
1446
1445
|
* Path of the debug image.
|
|
1447
|
-
* @default `${import.meta.dirname}/montage.png`
|
|
1448
1446
|
*/
|
|
1449
|
-
debugImagePath?: string;
|
|
1447
|
+
debugImagePath?: string | URL;
|
|
1450
1448
|
}
|
|
1451
1449
|
|
|
1452
1450
|
export declare interface GetAffineTransformResult {
|
|
@@ -3925,7 +3923,7 @@ export declare class Stack {
|
|
|
3925
3923
|
/**
|
|
3926
3924
|
* The bit depth of the images.
|
|
3927
3925
|
*/
|
|
3928
|
-
readonly bitDepth:
|
|
3926
|
+
readonly bitDepth: BitDepth;
|
|
3929
3927
|
/**
|
|
3930
3928
|
* Whether all the images of the stack have the same dimensions.
|
|
3931
3929
|
*/
|
package/lib/Stack.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type { BitDepth } from '
|
|
2
|
-
import type { Image } from './Image.js';
|
|
1
|
+
import type { BitDepth, Image } from './Image.js';
|
|
3
2
|
import type { HistogramOptions } from './compute/index.js';
|
|
4
3
|
import type { ImageColorModel } from './utils/constants/colorModels.js';
|
|
5
4
|
export declare class Stack {
|
package/lib/Stack.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Stack.d.ts","sourceRoot":"","sources":["../src/Stack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"Stack.d.ts","sourceRoot":"","sources":["../src/Stack.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAa3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAExE,qBAAa,KAAK;IAChB;;OAEG;IACH,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAU;IACjC;;OAEG;IACH,SAAgB,IAAI,EAAE,MAAM,CAAC;IAC7B;;OAEG;IACH,SAAgB,KAAK,EAAE,OAAO,CAAC;IAC/B;;OAEG;IACH,SAAgB,UAAU,EAAE,eAAe,CAAC;IAC5C;;OAEG;IACH,SAAgB,QAAQ,EAAE,QAAQ,CAAC;IACnC;;OAEG;IACH,SAAgB,cAAc,EAAE,OAAO,CAAC;IACxC;;OAEG;IACH,SAAgB,QAAQ,EAAE,MAAM,CAAC;IAEjC;;;;OAIG;gBACgB,MAAM,EAAE,KAAK,EAAE;IAWjC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAC;IAM7C;;;OAGG;IACI,KAAK,IAAI,KAAK;IAIrB;;;OAGG;IACI,SAAS,IAAI,KAAK,EAAE;IAI3B;;;;OAIG;IACI,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK;IAIrC;;;;;;;OAOG;IACI,QAAQ,CACb,UAAU,EAAE,MAAM,EAClB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,MAAM,GACd,MAAM;IAIT;;;;;;OAMG;IACI,eAAe,CACpB,UAAU,EAAE,MAAM,EAClB,KAAK,EAAE,MAAM,EACb,OAAO,EAAE,MAAM,GACd,MAAM;IAIT;;;;OAIG;IACI,QAAQ,IAAI,KAAK;IAIxB;;;;OAIG;IACI,QAAQ,IAAI,KAAK;IAIxB;;;;OAIG;IACI,WAAW,IAAI,KAAK;IAI3B;;;;OAIG;IACI,SAAS,IAAI,KAAK;IAIzB;;;;OAIG;IACI,GAAG,IAAI,KAAK;IAInB;;;;OAIG;IACI,SAAS,CAAC,OAAO,GAAE,gBAAqB,GAAG,WAAW;IAG7D;;;OAGG;IAGH;;;;OAIG;IACI,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,KAAK,GAAG,KAAK;IAIpD;;;;OAIG;IACI,MAAM,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK,OAAO,GAAG,KAAK;CAG1D"}
|
package/lib/Stack.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Stack.js","sourceRoot":"","sources":["../src/Stack.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"Stack.js","sourceRoot":"","sources":["../src/Stack.ts"],"names":[],"mappings":"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"}
|
|
@@ -38,9 +38,8 @@ export interface GetAffineTransformOptions {
|
|
|
38
38
|
debug?: boolean;
|
|
39
39
|
/**
|
|
40
40
|
* Path of the debug image.
|
|
41
|
-
* @default `${import.meta.dirname}/montage.png`
|
|
42
41
|
*/
|
|
43
|
-
debugImagePath?: string;
|
|
42
|
+
debugImagePath?: string | URL;
|
|
44
43
|
}
|
|
45
44
|
export interface AffineTransform {
|
|
46
45
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAffineTransform.d.ts","sourceRoot":"","sources":["../../../src/align/affineTransfrom/getAffineTransform.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAU5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAWrD,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,KAAK,CAAC;IAC1B;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB
|
|
1
|
+
{"version":3,"file":"getAffineTransform.d.ts","sourceRoot":"","sources":["../../../src/align/affineTransfrom/getAffineTransform.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAU5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAWrD,MAAM,WAAW,yBAAyB;IACxC;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;OAEG;IACH,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;;OAGG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;;OAMG;IACH,iBAAiB,CAAC,EAAE,KAAK,CAAC;IAC1B;;OAEG;IACH,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B;;;OAGG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,GAAG,CAAC;CAC/B;AAED,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,WAAW,EAAE,KAAK,CAAC;IACnB;;OAEG;IACH,QAAQ,EAAE,MAAM,CAAC;IACjB;;OAEG;IACH,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,wBAAwB;IACvC;;OAEG;IACH,SAAS,EAAE,eAAe,CAAC;IAC3B,KAAK,EAAE;QACL;;;WAGG;QACH,SAAS,EAAE,MAAM,CAAC;QAClB;;WAEG;QACH,SAAS,EAAE,MAAM,CAAC;QAClB;;WAEG;QACH,kBAAkB,EAAE,MAAM,CAAC;QAC3B;;WAEG;QACH,iBAAiB,EAAE,MAAM,CAAC;QAC1B;;WAEG;QACH,sBAAsB,EAAE,MAAM,CAAC;KAChC,CAAC;CACH;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,MAAM,EAAE,KAAK,EACb,WAAW,EAAE,KAAK,EAClB,OAAO,GAAE,yBAA8B,GACtC,wBAAwB,CA4L1B"}
|
|
@@ -20,7 +20,7 @@ import { getSourceWithoutMargins } from './utils/getSourceWithoutMargins.js';
|
|
|
20
20
|
* @returns The affine transformation from source to destination image.
|
|
21
21
|
*/
|
|
22
22
|
export function getAffineTransform(source, destination, options = {}) {
|
|
23
|
-
const { centroidPatchDiameter = 31, bestKeypointRadius = 5, enhanceContrast = true, crosscheck = true, destinationOrigin = { column: 0, row: 0 }, maxRansacNbIterations, debug = false, debugImagePath
|
|
23
|
+
const { centroidPatchDiameter = 31, bestKeypointRadius = 5, enhanceContrast = true, crosscheck = true, destinationOrigin = { column: 0, row: 0 }, maxRansacNbIterations, debug = false, debugImagePath, } = options;
|
|
24
24
|
if (source.colorModel !== ImageColorModel.GREY) {
|
|
25
25
|
source = source.grey();
|
|
26
26
|
}
|
|
@@ -98,6 +98,9 @@ export function getAffineTransform(source, destination, options = {}) {
|
|
|
98
98
|
}
|
|
99
99
|
// create debug image
|
|
100
100
|
if (debug) {
|
|
101
|
+
if (!debugImagePath) {
|
|
102
|
+
throw new RangeError('Debug image file path is not specified.');
|
|
103
|
+
}
|
|
101
104
|
const montage = new Montage(source, destination, {
|
|
102
105
|
disposition: MontageDisposition.VERTICAL,
|
|
103
106
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAffineTransform.js","sourceRoot":"","sources":["../../../src/align/affineTransfrom/getAffineTransform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,IAAI,wBAAwB,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AAGnC,OAAO,EAAE,QAAQ,EAAE,MAAM,+CAA+C,CAAC;AAEzE,OAAO,EACL,OAAO,EACP,kBAAkB,EAClB,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,gCAAgC,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,2DAA2D,CAAC;AAEpG,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,0BAA0B,EAAE,MAAM,iCAAiC,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"getAffineTransform.js","sourceRoot":"","sources":["../../../src/align/affineTransfrom/getAffineTransform.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decodeBmp.d.ts","sourceRoot":"","sources":["../../src/load/decodeBmp.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"decodeBmp.d.ts","sourceRoot":"","sources":["../../src/load/decodeBmp.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAQpC;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,UAAU,GAAG,KAAK,CA0BjD"}
|
package/lib/load/decodeBmp.js
CHANGED
|
@@ -30,7 +30,24 @@ export function decodeBmp(data) {
|
|
|
30
30
|
return new Image(decodedData.width, decodedData.height, {
|
|
31
31
|
colorModel,
|
|
32
32
|
data: decodedData.data,
|
|
33
|
+
resolution: getBmpResolution(decodedData),
|
|
33
34
|
});
|
|
34
35
|
}
|
|
35
36
|
}
|
|
37
|
+
/**
|
|
38
|
+
* Gets image's resolution from its parsed data. BMP stores resolution in
|
|
39
|
+
* pixels per meter.
|
|
40
|
+
* @param bmp - Parsed BMP image.
|
|
41
|
+
* @returns Object with resolution data if it is defined.
|
|
42
|
+
*/
|
|
43
|
+
function getBmpResolution(bmp) {
|
|
44
|
+
if (!bmp.xPixelsPerMeter || !bmp.yPixelsPerMeter) {
|
|
45
|
+
return undefined;
|
|
46
|
+
}
|
|
47
|
+
return {
|
|
48
|
+
x: bmp.xPixelsPerMeter,
|
|
49
|
+
y: bmp.yPixelsPerMeter,
|
|
50
|
+
unit: 'meter',
|
|
51
|
+
};
|
|
52
|
+
}
|
|
36
53
|
//# sourceMappingURL=decodeBmp.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decodeBmp.js","sourceRoot":"","sources":["../../src/load/decodeBmp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"decodeBmp.js","sourceRoot":"","sources":["../../src/load/decodeBmp.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAOlC;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,IAAgB;IACxC,MAAM,WAAW,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,IAAI,WAAW,CAAC,YAAY,KAAK,CAAC,EAAE,CAAC;QACnC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE;YAC3D,IAAI,EAAE,WAAW,CAAC,IAAkB;SACrC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;SAAM,CAAC;QACN,IAAI,UAA2B,CAAC;QAChC,QAAQ,WAAW,CAAC,QAAQ,EAAE,CAAC;YAC7B,KAAK,CAAC;gBACJ,UAAU,GAAG,MAAM,CAAC;gBACpB,MAAM;YACR,KAAK,CAAC;gBACJ,UAAU,GAAG,KAAK,CAAC;gBACnB,MAAM;YACR;gBACE,UAAU,GAAG,MAAM,CAAC;gBACpB,MAAM;QACV,CAAC;QACD,OAAO,IAAI,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE;YACtD,UAAU;YACV,IAAI,EAAE,WAAW,CAAC,IAAkB;YACpC,UAAU,EAAE,gBAAgB,CAAC,WAAW,CAAC;SAC1C,CAAC,CAAC;IACL,CAAC;AACH,CAAC;AAED;;;;;GAKG;AACH,SAAS,gBAAgB,CAAC,GAAe;IACvC,IAAI,CAAC,GAAG,CAAC,eAAe,IAAI,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;QACjD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO;QACL,CAAC,EAAE,GAAG,CAAC,eAAe;QACtB,CAAC,EAAE,GAAG,CAAC,eAAe;QACtB,IAAI,EAAE,OAAO;KACd,CAAC;AACJ,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decodePng.d.ts","sourceRoot":"","sources":["../../src/load/decodePng.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAMpC;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,KAAK,
|
|
1
|
+
{"version":3,"file":"decodePng.d.ts","sourceRoot":"","sources":["../../src/load/decodePng.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAMpC;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,MAAM,EAAE,UAAU,GAAG,KAAK,CAqCnD"}
|
package/lib/load/decodePng.js
CHANGED
|
@@ -35,21 +35,7 @@ export function decodePng(buffer) {
|
|
|
35
35
|
default:
|
|
36
36
|
throw new RangeError(`invalid number of channels: ${png.channels}`);
|
|
37
37
|
}
|
|
38
|
-
|
|
39
|
-
if (png.resolution) {
|
|
40
|
-
resolution =
|
|
41
|
-
png.resolution.unit === 1
|
|
42
|
-
? /*If the resolution unit is meters*/ {
|
|
43
|
-
x: png.resolution.x,
|
|
44
|
-
y: png.resolution.y,
|
|
45
|
-
unit: 'meter',
|
|
46
|
-
}
|
|
47
|
-
: /*If resolution unit is unknown */ {
|
|
48
|
-
x: png.resolution.x,
|
|
49
|
-
y: png.resolution.y,
|
|
50
|
-
unit: 'unknown',
|
|
51
|
-
};
|
|
52
|
-
}
|
|
38
|
+
const resolution = getResolution(png);
|
|
53
39
|
return new Image(png.width, png.height, {
|
|
54
40
|
colorModel,
|
|
55
41
|
bitDepth,
|
|
@@ -83,9 +69,11 @@ function loadPalettePng(png) {
|
|
|
83
69
|
data[dataIndex++] = paletteChannel;
|
|
84
70
|
}
|
|
85
71
|
}
|
|
72
|
+
const resolution = getResolution(png);
|
|
86
73
|
return new Image(png.width, png.height, {
|
|
87
74
|
data,
|
|
88
75
|
colorModel: png.palette[0].length === 4 ? 'RGBA' : 'RGB',
|
|
76
|
+
resolution,
|
|
89
77
|
});
|
|
90
78
|
}
|
|
91
79
|
function decodeBinary(png) {
|
|
@@ -105,4 +93,27 @@ function decodeBinary(png) {
|
|
|
105
93
|
}
|
|
106
94
|
return result;
|
|
107
95
|
}
|
|
96
|
+
/**
|
|
97
|
+
* Gets image's resolution from its parsed data.
|
|
98
|
+
* @param png - Parsed .png image.
|
|
99
|
+
* @returns Object with resolution data if exists.
|
|
100
|
+
*/
|
|
101
|
+
function getResolution(png) {
|
|
102
|
+
if (png.resolution) {
|
|
103
|
+
return png.resolution.unit === 1
|
|
104
|
+
? /*If the resolution unit is meters*/ {
|
|
105
|
+
x: png.resolution.x,
|
|
106
|
+
y: png.resolution.y,
|
|
107
|
+
unit: 'meter',
|
|
108
|
+
}
|
|
109
|
+
: /*If resolution unit is unknown */ {
|
|
110
|
+
x: png.resolution.x,
|
|
111
|
+
y: png.resolution.y,
|
|
112
|
+
unit: 'unknown',
|
|
113
|
+
};
|
|
114
|
+
}
|
|
115
|
+
else {
|
|
116
|
+
return undefined;
|
|
117
|
+
}
|
|
118
|
+
}
|
|
108
119
|
//# sourceMappingURL=decodePng.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"decodePng.js","sourceRoot":"","sources":["../../src/load/decodePng.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEpC,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAIvD;;;;GAIG;AACH,MAAM,UAAU,SAAS,CAAC,MAAkB;IAC1C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC;IAE3B,IAAI,UAA2B,CAAC;IAChC,MAAM,QAAQ,GAAa,GAAG,CAAC,KAAiB,CAAC;IACjD,IAAI,GAAG,CAAC,OAAO,EAAE,CAAC;QAChB,OAAO,cAAc,CAAC,GAAG,CAAC,CAAC;IAC7B,CAAC;IACD,IAAI,QAAQ,KAAK,CAAC,EAAE,CAAC;QACnB,OAAO,IAAI,KAAK,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE;YACtC,IAAI,EAAE,YAAY,CAAC,GAAG,CAAC;YACvB,UAAU,EAAE,MAAM;SACnB,CAAC,CAAC;IACL,CAAC;IACD,QAAQ,GAAG,CAAC,QAAQ,EAAE,CAAC;QACrB,KAAK,CAAC;YACJ,UAAU,GAAG,MAAM,CAAC;YACpB,MAAM;QACR,KAAK,CAAC;YACJ,UAAU,GAAG,OAAO,CAAC;YACrB,MAAM;QACR,KAAK,CAAC;YACJ,UAAU,GAAG,KAAK,CAAC;YACnB,MAAM;QACR,KAAK,CAAC;YACJ,UAAU,GAAG,MAAM,CAAC;YACpB,MAAM;QACR;YACE,MAAM,IAAI,UAAU,CAAC,+BAA+B,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;IACxE,CAAC;IACD,
|
|
1
|
+
{"version":3,"file":"decodePng.js","sourceRoot":"","sources":["../../src/load/decodePng.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getContourMoore.d.ts","sourceRoot":"","sources":["../../src/maskAnalysis/getContourMoore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getContourMoore.d.ts","sourceRoot":"","sources":["../../src/maskAnalysis/getContourMoore.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,6BAA6B,CAAC;AAqCzD;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,IAAI,GAAG,KAAK,EAAE,CAsDnD"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import assert from
|
|
1
|
+
import { assert } from "../utils/validators/assert.js";
|
|
2
2
|
import { getBitSafe, getCoordsFromIndex, } from "./utils/getExternalContourUtils.js";
|
|
3
3
|
/**
|
|
4
4
|
* Possible directions.
|
|
@@ -53,7 +53,7 @@ export function getContourMoore(mask) {
|
|
|
53
53
|
contour.push(currentPoint);
|
|
54
54
|
}
|
|
55
55
|
const next = findNextPoint(mask, currentPoint, backtrackPoint);
|
|
56
|
-
assert
|
|
56
|
+
assert(next, 'Next border point is undefined.');
|
|
57
57
|
backtrackPoint = next.prevPoint;
|
|
58
58
|
currentPoint = next.currPoint;
|
|
59
59
|
if (currentPoint.column === startingPoint.column &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getContourMoore.js","sourceRoot":"","sources":["../../src/maskAnalysis/getContourMoore.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"getContourMoore.js","sourceRoot":"","sources":["../../src/maskAnalysis/getContourMoore.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "image-js",
|
|
3
|
-
"version": "1.6.
|
|
3
|
+
"version": "1.6.2",
|
|
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
|
-
"
|
|
70
|
-
"
|
|
72
|
+
"vite>esbuild": false,
|
|
73
|
+
"skia-canvas#3.0.8": true
|
|
71
74
|
}
|
|
72
75
|
},
|
|
73
76
|
"devDependencies": {
|
|
74
|
-
"@lavamoat/allow-scripts": "^
|
|
75
|
-
"@lavamoat/preinstall-always-fail": "^
|
|
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/Stack.ts
CHANGED
|
@@ -60,9 +60,8 @@ export interface GetAffineTransformOptions {
|
|
|
60
60
|
debug?: boolean;
|
|
61
61
|
/**
|
|
62
62
|
* Path of the debug image.
|
|
63
|
-
* @default `${import.meta.dirname}/montage.png`
|
|
64
63
|
*/
|
|
65
|
-
debugImagePath?: string;
|
|
64
|
+
debugImagePath?: string | URL;
|
|
66
65
|
}
|
|
67
66
|
|
|
68
67
|
export interface AffineTransform {
|
|
@@ -131,7 +130,7 @@ export function getAffineTransform(
|
|
|
131
130
|
destinationOrigin = { column: 0, row: 0 },
|
|
132
131
|
maxRansacNbIterations,
|
|
133
132
|
debug = false,
|
|
134
|
-
debugImagePath
|
|
133
|
+
debugImagePath,
|
|
135
134
|
} = options;
|
|
136
135
|
|
|
137
136
|
if (source.colorModel !== ImageColorModel.GREY) {
|
|
@@ -242,6 +241,9 @@ export function getAffineTransform(
|
|
|
242
241
|
|
|
243
242
|
// create debug image
|
|
244
243
|
if (debug) {
|
|
244
|
+
if (!debugImagePath) {
|
|
245
|
+
throw new RangeError('Debug image file path is not specified.');
|
|
246
|
+
}
|
|
245
247
|
const montage = new Montage(source, destination, {
|
|
246
248
|
disposition: MontageDisposition.VERTICAL,
|
|
247
249
|
});
|
package/src/load/decodeBmp.ts
CHANGED
|
@@ -4,6 +4,10 @@ import { Image } from '../Image.ts';
|
|
|
4
4
|
import { Mask } from '../Mask.ts';
|
|
5
5
|
import type { ImageColorModel } from '../utils/constants/colorModels.ts';
|
|
6
6
|
|
|
7
|
+
import type { Resolution } from './load.types.ts';
|
|
8
|
+
|
|
9
|
+
type DecodedBmp = ReturnType<typeof decode>;
|
|
10
|
+
|
|
7
11
|
/**
|
|
8
12
|
* Decode a BMP. See the fast-bmp npm module.
|
|
9
13
|
* @param data - The data to decode.
|
|
@@ -32,6 +36,24 @@ export function decodeBmp(data: Uint8Array): Image {
|
|
|
32
36
|
return new Image(decodedData.width, decodedData.height, {
|
|
33
37
|
colorModel,
|
|
34
38
|
data: decodedData.data as Uint8Array,
|
|
39
|
+
resolution: getBmpResolution(decodedData),
|
|
35
40
|
});
|
|
36
41
|
}
|
|
37
42
|
}
|
|
43
|
+
|
|
44
|
+
/**
|
|
45
|
+
* Gets image's resolution from its parsed data. BMP stores resolution in
|
|
46
|
+
* pixels per meter.
|
|
47
|
+
* @param bmp - Parsed BMP image.
|
|
48
|
+
* @returns Object with resolution data if it is defined.
|
|
49
|
+
*/
|
|
50
|
+
function getBmpResolution(bmp: DecodedBmp): Resolution | undefined {
|
|
51
|
+
if (!bmp.xPixelsPerMeter || !bmp.yPixelsPerMeter) {
|
|
52
|
+
return undefined;
|
|
53
|
+
}
|
|
54
|
+
return {
|
|
55
|
+
x: bmp.xPixelsPerMeter,
|
|
56
|
+
y: bmp.yPixelsPerMeter,
|
|
57
|
+
unit: 'meter',
|
|
58
|
+
};
|
|
59
|
+
}
|
package/src/load/decodePng.ts
CHANGED
|
@@ -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
|
-
|
|
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
|
+
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
|
-
import assert from 'node:assert';
|
|
2
|
-
|
|
3
1
|
import type { Mask } from '../Mask.ts';
|
|
4
2
|
import type { Point } from '../utils/geometry/points.ts';
|
|
3
|
+
import { assert } from '../utils/validators/assert.ts';
|
|
5
4
|
|
|
6
5
|
import {
|
|
7
6
|
getBitSafe,
|
|
@@ -78,7 +77,7 @@ export function getContourMoore(mask: Mask): Point[] {
|
|
|
78
77
|
}
|
|
79
78
|
|
|
80
79
|
const next = findNextPoint(mask, currentPoint, backtrackPoint);
|
|
81
|
-
assert
|
|
80
|
+
assert(next, 'Next border point is undefined.');
|
|
82
81
|
backtrackPoint = next.prevPoint;
|
|
83
82
|
currentPoint = next.currPoint;
|
|
84
83
|
if (
|