Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/nut.js/lib/imageResources.function.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { join, normalize } from "path";
import { URL } from "url";
import { ColorMode, Image } from "@nut-tree/shared";
import Jimp from "jimp";
import { Jimp } from "jimp";
import { ProviderRegistry } from "@nut-tree/provider-interfaces";

export function loadImageResource(
Expand Down
6 changes: 2 additions & 4 deletions core/nut.js/lib/provider/image/jimp-image-processor.class.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Jimp from "jimp";
import { intToRGBA } from "jimp";
import { Image, imageToJimp, Point, RGBA } from "@nut-tree/shared";
import { ImageProcessor } from "@nut-tree/provider-interfaces";

Expand All @@ -20,9 +20,7 @@ export default class implements ImageProcessor {
);
}
const jimpImage = imageToJimp(img);
const rgba = Jimp.intToRGBA(
jimpImage.getPixelColor(location.x, location.y)
);
const rgba = intToRGBA(jimpImage.getPixelColor(location.x, location.y));
return new RGBA(rgba.r, rgba.g, rgba.b, rgba.a);
}
}
4 changes: 2 additions & 2 deletions core/nut.js/lib/provider/io/jimp-image-reader.class.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ImageReader from "./jimp-image-reader.class";
import { join } from "path";
import Jimp from "jimp";
import { Jimp } from "jimp";

jest.mock("jimp", () => {
class JimpMock {
Expand All @@ -15,7 +15,7 @@ jest.mock("jimp", () => {

return {
__esModule: true,
default: JimpMock,
Jimp: JimpMock,
};
});

Expand Down
2 changes: 1 addition & 1 deletion core/nut.js/lib/provider/io/jimp-image-reader.class.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Jimp from "jimp";
import { Jimp } from "jimp";
import { ImageReader } from "@nut-tree/provider-interfaces";
import { ColorMode, Image } from "@nut-tree/shared";

Expand Down
8 changes: 4 additions & 4 deletions core/nut.js/lib/provider/io/jimp-image-writer.class.spec.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import ImageWriter from "./jimp-image-writer.class";
import { Image } from "@nut-tree/shared";
import Jimp from "jimp";
import { Jimp } from "jimp";

jest.mock("jimp", () => {
class JimpMock {
Expand All @@ -15,7 +15,7 @@ jest.mock("jimp", () => {

return {
__esModule: true,
default: JimpMock
Jimp: JimpMock
};
});

Expand All @@ -37,7 +37,7 @@ describe("Jimp image writer", () => {
const writeMock = jest.fn(() => Promise.resolve(new Jimp()));
const scanMock = jest.fn();
Jimp.prototype.scan = scanMock;
Jimp.prototype.writeAsync = writeMock;
Jimp.prototype.write = writeMock;
const SUT = new ImageWriter();

// WHEN
Expand All @@ -63,7 +63,7 @@ describe("Jimp image writer", () => {
);
const writeMock = jest.fn(() => Promise.reject("write error"));
Jimp.prototype.scan = jest.fn();
Jimp.prototype.writeAsync = writeMock;
Jimp.prototype.write = writeMock;
const SUT = new ImageWriter();

// WHEN
Expand Down
2 changes: 1 addition & 1 deletion core/nut.js/lib/provider/io/jimp-image-writer.class.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ export default class implements ImageWriter {
return new Promise((resolve, reject) => {
const jimpImage = imageToJimp(parameters.image);
jimpImage
.writeAsync(parameters.path)
.write(parameters.path)
.then((_) => resolve())
.catch((err) => reject(err));
});
Expand Down
2 changes: 1 addition & 1 deletion core/nut.js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@nut-tree/libnut": "workspace:*",
"@nut-tree/shared": "workspace:*",
"@nut-tree/provider-interfaces": "workspace:*",
"jimp": "0.22.10",
"jimp": "1.1.2",
"node-abort-controller": "3.1.1"
},
"devDependencies": {
Expand Down
4 changes: 2 additions & 2 deletions core/shared/lib/functions/imageToJimp.function.spec.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { imageToJimp } from "./imageToJimp.function";
import Jimp from "jimp";
import { Jimp } from "jimp";
import { Image } from "../objects/image.class";

jest.mock("jimp", () => {
Expand All @@ -15,7 +15,7 @@ jest.mock("jimp", () => {

return {
__esModule: true,
default: JimpMock
Jimp: JimpMock
};
});

Expand Down
2 changes: 1 addition & 1 deletion core/shared/lib/functions/imageToJimp.function.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Jimp from "jimp";
import { Jimp } from "jimp";
import { ColorMode } from "../enums/colormode.enum";
import { Image } from "../objects/image.class";

Expand Down
2 changes: 1 addition & 1 deletion core/shared/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"dependencies": {
"node-abort-controller": "3.1.1",
"jimp": "0.22.10"
"jimp": "1.1.2"
},
"devDependencies": {
"@nut-tree/configs": "workspace:*"
Expand Down
Loading