nbis-wrapper-js 0.2.0 → 0.3.0

package/README.md

@@ -64,7 +64,11 @@ const mindtct = new Mindtct({ autoConvert: false });
 
 // Or tune WSQ conversion:
 const tuned = new Mindtct({
-  autoConvert: { wsqBitrate: 0.75, ppi: 500 }
+  autoConvert: {
+    wsqBitrate: 0.75,
+    ppi: 500,
+    upscale: { enabled: true, minSize: 256 }
+  }
 });
 ```
 

package/dist/src/image-convert.d.ts

@@ -2,11 +2,20 @@ export type AutoConvertConfig = {
     enabled?: boolean;
     wsqBitrate?: number;
     ppi?: number;
+    upscale?: boolean | AutoConvertUpscaleConfig;
+};
+export type AutoConvertUpscaleConfig = {
+    enabled?: boolean;
+    minSize?: number;
 };
 export type NormalizedAutoConvertConfig = {
     enabled: boolean;
     wsqBitrate: number;
     ppi?: number;
+    upscale: {
+        enabled: boolean;
+        minSize: number;
+    };
 };
 export type PreparedImage = {
     path: string;

package/dist/src/image-convert.js

@@ -13,16 +13,26 @@ const jpeg_js_1 = __importDefault(require("jpeg-js"));
 const nbis_runtime_1 = require("./nbis-runtime");
 const SUPPORTED_ANSI_NIST_EXTENSIONS = new Set(['.an2', '.an2k', '.an2k7', '.eft']);
 function normalizeAutoConvert(config) {
+    const defaultUpscale = { enabled: false, minSize: 256 };
     if (config == null) {
-        return { enabled: true, wsqBitrate: 0.75 };
+        return { enabled: true, wsqBitrate: 0.75, upscale: defaultUpscale };
     }
     if (typeof config === 'boolean') {
-        return { enabled: config, wsqBitrate: 0.75 };
+        return { enabled: config, wsqBitrate: 0.75, upscale: defaultUpscale };
     }
+    const upscale = config.upscale == null
+        ? defaultUpscale
+        : typeof config.upscale === 'boolean'
+            ? { enabled: config.upscale, minSize: defaultUpscale.minSize }
+            : {
+                enabled: config.upscale.enabled ?? defaultUpscale.enabled,
+                minSize: config.upscale.minSize ?? defaultUpscale.minSize
+            };
     return {
         enabled: config.enabled ?? true,
         wsqBitrate: config.wsqBitrate ?? 0.75,
-        ppi: config.ppi
+        ppi: config.ppi,
+        upscale
     };
 }
 function detectFormat(inputPath) {
@@ -61,6 +71,17 @@ function toGrayscale(rgba) {
     }
     return gray;
 }
+function upscaleNearest(pixels, width, height, newWidth, newHeight) {
+    const scaled = Buffer.alloc(newWidth * newHeight);
+    for (let y = 0; y < newHeight; y += 1) {
+        const srcY = Math.min(height - 1, Math.floor((y * height) / newHeight));
+        for (let x = 0; x < newWidth; x += 1) {
+            const srcX = Math.min(width - 1, Math.floor((x * width) / newWidth));
+            scaled[y * newWidth + x] = pixels[srcY * width + srcX];
+        }
+    }
+    return scaled;
+}
 function decodeImage(inputPath, format) {
     const data = fs_1.default.readFileSync(inputPath);
     if (format === 'png') {
@@ -84,9 +105,23 @@ function convertToWsq(inputPath, tempDir, config) {
         return inputPath;
     }
     const decoded = decodeImage(inputPath, format);
+    let width = decoded.width;
+    let height = decoded.height;
+    let pixels = decoded.pixels;
+    if (config.upscale.enabled) {
+        const minSize = config.upscale.minSize;
+        if (width < minSize || height < minSize) {
+            const scale = Math.max(minSize / width, minSize / height);
+            const newWidth = Math.ceil(width * scale);
+            const newHeight = Math.ceil(height * scale);
+            pixels = upscaleNearest(pixels, width, height, newWidth, newHeight);
+            width = newWidth;
+            height = newHeight;
+        }
+    }
     const rawPath = path_1.default.join(tempDir, 'input.raw');
-    fs_1.default.writeFileSync(rawPath, decoded.pixels);
-    const rawAttrs = [decoded.width, decoded.height, 8];
+    fs_1.default.writeFileSync(rawPath, pixels);
+    const rawAttrs = [width, height, 8];
     if (config.ppi != null) {
         rawAttrs.push(config.ppi);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nbis-wrapper-js",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Node.js wrappers for NBIS 5.0.0 binaries",
   "main": "dist/src/index.js",
   "types": "dist/src/index.d.ts",