Skip to content

Commit

Permalink
fix: update TIFF decoder (#575)
Browse files Browse the repository at this point in the history
Fixes: #574
  • Loading branch information
targos committed Oct 31, 2021
1 parent 93d3cce commit 8a09396
Show file tree
Hide file tree
Showing 6 changed files with 39 additions and 38 deletions.
1 change: 1 addition & 0 deletions .eslintrc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ parserOptions:
sourceType: module

rules:
func-names: off
import/no-cycle: off
import/no-extraneous-dependencies: off
# TODO: re-enable once https://github.com/benmosher/eslint-plugin-import/issues/2063 is fixed.
Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand All @@ -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",
Expand All @@ -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": {
Expand Down
4 changes: 2 additions & 2 deletions src/image/compute/__tests__/histogram.js
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ describe('calculate the histogram', function () {
);
let image2 = image.mask();
let histogram = image2.getHistogram();
expect(histogram[0]).toStrictEqual(16);
expect(histogram[1]).toStrictEqual(9);
expect(histogram[0]).toBe(16);
expect(histogram[1]).toBe(9);
});
});
2 changes: 1 addition & 1 deletion src/image/roi/__tests__/feretDiameters.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ describe('Feret diameters', function () {
[2, 2],
[0, 0],
],
max: 4.242,
max: 4.2426,
maxLine: [
[0, 3],
[3, 0],
Expand Down
42 changes: 21 additions & 21 deletions src/image/roi/__tests__/findCorrespondingRoi.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ describe('findCorrespondingRoi', function () {
4 / 9,
3 / 9,
]);
expect(related[0].same).toStrictEqual(5);
expect(related[0].opposite).toStrictEqual(4);
expect(related[0].total).toStrictEqual(9);
expect(related[0].same).toBe(5);
expect(related[0].opposite).toBe(4);
expect(related[0].total).toBe(9);
expect(Array.from(related[1].id)).toStrictEqual([-1]);
expect(Array.from(related[1].surface)).toStrictEqual([16]);
expect(Array.from(related[1].roiSurfaceCovered)).toStrictEqual([1]);
expect(related[1].same).toStrictEqual(16);
expect(related[1].opposite).toStrictEqual(0);
expect(related[1].total).toStrictEqual(16);
expect(related[1].same).toBe(16);
expect(related[1].opposite).toBe(0);
expect(related[1].total).toBe(16);
});
it('should yield the correct object containing corresponding roi ids and pixels (switch imgs from prev test)', function () {
let img1 = new Image(
Expand Down Expand Up @@ -94,24 +94,24 @@ describe('findCorrespondingRoi', function () {
expect(Array.from(related[0].id)).toStrictEqual([1]);
expect(Array.from(related[0].surface)).toStrictEqual([2]);
expect(Array.from(related[0].roiSurfaceCovered)).toStrictEqual([1]);
expect(related[0].same).toStrictEqual(2);
expect(related[0].opposite).toStrictEqual(0);
expect(related[0].total).toStrictEqual(2);
expect(related[0].same).toBe(2);
expect(related[0].opposite).toBe(0);
expect(related[0].total).toBe(2);
expect(Array.from(related[1].id)).toStrictEqual([1]);
expect(Array.from(related[1].surface)).toStrictEqual([3]);
expect(Array.from(related[1].roiSurfaceCovered)).toStrictEqual([1]);
expect(related[1].same).toStrictEqual(3);
expect(related[1].opposite).toStrictEqual(0);
expect(related[1].total).toStrictEqual(3);
expect(related[1].same).toBe(3);
expect(related[1].opposite).toBe(0);
expect(related[1].total).toBe(3);
expect(Array.from(related[2].id)).toStrictEqual([-1, 1]);
expect(Array.from(related[2].surface)).toStrictEqual([16, 4]);
expect(Array.from(related[2].roiSurfaceCovered)).toStrictEqual([
16 / 20,
4 / 20,
]);
expect(related[2].same).toStrictEqual(16);
expect(related[2].opposite).toStrictEqual(4);
expect(related[2].total).toStrictEqual(20);
expect(related[2].same).toBe(16);
expect(related[2].opposite).toBe(4);
expect(related[2].total).toBe(20);
});

it('should yield the correct object containing 2 elements with same roi ids and different number of pixels (covering entire image)', function () {
Expand Down Expand Up @@ -154,15 +154,15 @@ describe('findCorrespondingRoi', function () {
expect(Array.from(related[0].id)).toStrictEqual([-1]);
expect(Array.from(related[0].surface)).toStrictEqual([9]);
expect(Array.from(related[0].roiSurfaceCovered)).toStrictEqual([1]);
expect(related[0].same).toStrictEqual(0);
expect(related[0].opposite).toStrictEqual(9);
expect(related[0].total).toStrictEqual(9);
expect(related[0].same).toBe(0);
expect(related[0].opposite).toBe(9);
expect(related[0].total).toBe(9);
expect(Array.from(related[1].id)).toStrictEqual([-1]);
expect(Array.from(related[1].surface)).toStrictEqual([16]);
expect(Array.from(related[1].roiSurfaceCovered)).toStrictEqual([1]);
expect(related[1].same).toStrictEqual(16);
expect(related[1].opposite).toStrictEqual(0);
expect(related[1].total).toStrictEqual(16);
expect(related[1].same).toBe(16);
expect(related[1].opposite).toBe(0);
expect(related[1].total).toBe(16);
});

it('should yield the correct object containing 1 element with one roi id and al of pixels (covering entire image)', function () {
Expand Down
2 changes: 1 addition & 1 deletion src/image/utility/__tests__/getSimilarity.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ describe('calculate the overlap with another image', function () {
expect(similarity).toBe(1);

similarity = image.getSimilarity(image2);
expect(similarity).toStrictEqual(1);
expect(similarity).toBe(1);

similarity = image.getSimilarity(image2, {
average: false,
Expand Down

0 comments on commit 8a09396

Please sign in to comment.