(#131) Updated usage of image-processor to exported functions

Author: s1hofmann

lib/provider/opencv/image-writer.class.ts

@@ -1,16 +1,16 @@
 import * as cv from "opencv4nodejs-prebuilt";
-import { Image } from "../../image.class";
-import { DataSink } from "./data-sink.interface";
-import { ImageProcessor } from "./image-processor.class";
+import {Image} from "../../image.class";
+import {DataSink} from "./data-sink.interface";
+import {fromImageWithAlphaChannel, fromImageWithoutAlphaChannel} from "./image-processor.class";
 
 export class ImageWriter implements DataSink {
-  public async store(data: Image, path: string): Promise<void> {
-    let outputMat: cv.Mat;
-    if (data.hasAlphaChannel) {
-      outputMat = await ImageProcessor.fromImageWithAlphaChannel(data);
-    } else {
-      outputMat = await ImageProcessor.fromImageWithoutAlphaChannel(data);
+    public async store(data: Image, path: string): Promise<void> {
+        let outputMat: cv.Mat;
+        if (data.hasAlphaChannel) {
+            outputMat = await fromImageWithAlphaChannel(data);
+        } else {
+            outputMat = await fromImageWithoutAlphaChannel(data);
+        }
+        return cv.imwriteAsync(path, outputMat);
     }
-    return cv.imwriteAsync(path, outputMat);
-  }
 }

lib/provider/opencv/scale-image.function.spec.ts

@@ -1,40 +1,40 @@
 import * as path from "path";
-import { ImageProcessor } from "./image-processor.class";
-import { ImageReader } from "./image-reader.class";
-import { scaleImage } from "./scale-image.function";
+import {ImageReader} from "./image-reader.class";
+import {scaleImage} from "./scale-image.function";
+import {fromImageWithoutAlphaChannel} from "./image-processor.class";
 
 describe("scaleImage", () => {
-  it.each([[0.5], [1.5]])("should scale an image correctly by factor %f", async (scaleFactor) => {
-    // GIVEN
-    const imageLoader = new ImageReader();
-    const pathToinput = path.resolve(__dirname, "./__mocks__/mouse.png");
-    const inputImage = await imageLoader.load(pathToinput);
-    const inputMat = await ImageProcessor.fromImageWithoutAlphaChannel(inputImage);
-    const expectedWidth = Math.floor(inputMat.cols * scaleFactor);
-    const expectedHeight = Math.floor(inputMat.rows * scaleFactor);
+    it.each([[0.5], [1.5]])("should scale an image correctly by factor %f", async (scaleFactor) => {
+        // GIVEN
+        const imageLoader = new ImageReader();
+        const pathToinput = path.resolve(__dirname, "./__mocks__/mouse.png");
+        const inputImage = await imageLoader.load(pathToinput);
+        const inputMat = await fromImageWithoutAlphaChannel(inputImage);
+        const expectedWidth = Math.floor(inputMat.cols * scaleFactor);
+        const expectedHeight = Math.floor(inputMat.rows * scaleFactor);
 
-    // WHEN
-    const result = await scaleImage(inputMat, scaleFactor);
+        // WHEN
+        const result = await scaleImage(inputMat, scaleFactor);
 
-    // THEN
-    expect(result.rows).toBe(expectedHeight);
-    expect(result.cols).toBe(expectedWidth);
-  });
+        // THEN
+        expect(result.rows).toBe(expectedHeight);
+        expect(result.cols).toBe(expectedWidth);
+    });
 
-  it.each([[0], [-0.25]])("should keep scale if factor <= 0: Scale %f", async (scaleFactor) => {
-    // GIVEN
-    const imageLoader = new ImageReader();
-    const pathToinput = path.resolve(__dirname, "./__mocks__/mouse.png");
-    const inputImage = await imageLoader.load(pathToinput);
-    const inputMat = await ImageProcessor.fromImageWithoutAlphaChannel(inputImage);
-    const expectedWidth = inputMat.cols;
-    const expectedHeight = inputMat.rows;
+    it.each([[0], [-0.25]])("should keep scale if factor <= 0: Scale %f", async (scaleFactor) => {
+        // GIVEN
+        const imageLoader = new ImageReader();
+        const pathToinput = path.resolve(__dirname, "./__mocks__/mouse.png");
+        const inputImage = await imageLoader.load(pathToinput);
+        const inputMat = await fromImageWithoutAlphaChannel(inputImage);
+        const expectedWidth = inputMat.cols;
+        const expectedHeight = inputMat.rows;
 
-    // WHEN
-    const result = await scaleImage(inputMat, scaleFactor);
+        // WHEN
+        const result = await scaleImage(inputMat, scaleFactor);
 
-    // THEN
-    expect(result.rows).toBe(expectedHeight);
-    expect(result.cols).toBe(expectedWidth);
-  });
+        // THEN
+        expect(result.rows).toBe(expectedHeight);
+        expect(result.cols).toBe(expectedWidth);
+    });
 });