@li0ard/wsq 0.1.1 → 0.1.2

package/dist/const.js

@@ -208,8 +208,8 @@ const buildWTree = (token, wtreelen, width, height) => {
         token.wtree[19].leny = (token.wtree[15].leny + 1) / 2;
 };
 const wtree4 = (token, start1, start2, lenx, leny, x, y, stop1) => {
-    let p1 = start1, p2 = start2;
-    let evenx = lenx % 2, eveny = leny % 2;
+    const p1 = start1, p2 = start2;
+    const evenx = lenx % 2, eveny = leny % 2;
     if (!token.wtree)
         return;
     token.wtree[p1].x = x;
@@ -408,7 +408,7 @@ const qtree16 = (token, start, lenx, leny, x, y, rw, cl) => {
     token.qtree[p + 15].leny = token.qtree[p + 10].leny;
 };
 const qtree4 = (token, start, lenx, leny, x, y) => {
-    let p = start, evenx = lenx % 2, eveny = leny % 2;
+    const p = start, evenx = lenx % 2, eveny = leny % 2;
     if (!token.qtree)
         return;
     token.qtree[p].x = x;

package/dist/index.d.ts

@@ -1,5 +1,8 @@
+import { BitmapWithMetadata } from "./bitmap.js";
+export declare const wsqToRAW: (data: Uint8Array) => BitmapWithMetadata;
 /**
  * Convert Wavelet Scalar Quantization (`.wsq`) to PNG
  * @param data WSQ buffer
  */
 export declare const wsqToPNG: (data: Uint8Array) => Uint8Array;
+export { BitmapWithMetadata } from "./bitmap.js";

package/dist/index.js

@@ -12,14 +12,14 @@ class WSQDecoder {
             this.getCTableWSQ(dataInput, token, marker);
             marker = this.getCMarkerWSQ(dataInput, TBLS_N_SOF);
         }
-        let frmHeaderWSQ = this.getCFrameHeaderWSQ(dataInput);
-        let width = frmHeaderWSQ.width;
-        let height = frmHeaderWSQ.height;
+        const frmHeaderWSQ = this.getCFrameHeaderWSQ(dataInput);
+        const width = frmHeaderWSQ.width;
+        const height = frmHeaderWSQ.height;
         buildWSQTrees(token, width, height);
-        let qdata = this.huffmanDecodeDataMem(dataInput, token, width * height);
-        let fdata = this.unquantize(token, qdata, width, height);
+        const qdata = this.huffmanDecodeDataMem(dataInput, token, width * height);
+        const fdata = this.unquantize(token, qdata, width, height);
         this.wsqReconstruct(token, fdata, width, height);
-        let cdata = this.convertImageToByte(fdata, width, height, frmHeaderWSQ.mShift, frmHeaderWSQ.rScale);
+        const cdata = this.convertImageToByte(fdata, width, height, frmHeaderWSQ.mShift, frmHeaderWSQ.rScale);
         const nistcom = new Map();
         const comments = [];
         for (const comment of token.comments) {
@@ -68,7 +68,7 @@ class WSQDecoder {
         return result;
     }
     convertImageToByte(img, width, height, mShift, rScale) {
-        let data = new Uint8Array(width * height);
+        const data = new Uint8Array(width * height);
         let idx = 0;
         for (let r = 0; r < height; r++) {
             for (let c = 0; c < width; c++) {
@@ -93,10 +93,10 @@ class WSQDecoder {
             throw new Error("ERROR: wsq_reconstruct : Lopass filter coefficients not defined");
         if (token.tableDTT.hidef != 1)
             throw new Error("ERROR: wsq_reconstruct : Hipass filter coefficients not defined");
-        let numPix = width * height;
-        let fdataTemp = new Float32Array(numPix);
+        const numPix = width * height;
+        const fdataTemp = new Float32Array(numPix);
         for (let node = W_TREELEN - 1; node >= 0; node--) {
-            let fdataBse = (token.wtree[node].y * width) + token.wtree[node].x;
+            const fdataBse = (token.wtree[node].y * width) + token.wtree[node].x;
             this.joinLets(fdataTemp, fdata, 0, fdataBse, token.wtree[node].lenx, token.wtree[node].leny, 1, width, token.tableDTT.hifilt, token.tableDTT.hisz, token.tableDTT.lofilt, token.tableDTT.losz, token.wtree[node].invcl);
             this.joinLets(fdata, fdataTemp, fdataBse, 0, token.wtree[node].leny, token.wtree[node].lenx, width, 1, token.tableDTT.hifilt, token.tableDTT.hisz, token.tableDTT.lofilt, token.tableDTT.losz, token.wtree[node].invrw);
         }
@@ -408,10 +408,10 @@ class WSQDecoder {
         }
     }
     unquantize(token, sip, width, height) {
-        let fip = new Float32Array(width * height);
+        const fip = new Float32Array(width * height);
         if (token.tableDQT.dqtDef != 1)
             throw new Error("ERROR: unquantize : quantization table parameters not defined!");
-        let binCenter = token.tableDQT.binCenter;
+        const binCenter = token.tableDQT.binCenter;
         let sptr = 0;
         for (let cnt = 0; cnt < NUM_SUBBANDS; cnt++) {
             if (token.tableDQT.qBin[cnt] == 0.0)
@@ -435,13 +435,13 @@ class WSQDecoder {
         return fip;
     }
     huffmanDecodeDataMem(dataInput, token, size) {
-        let qdata = new Array(size);
-        let maxcode = new Array(MAX_HUFFBITS + 1);
-        let mincode = new Array(MAX_HUFFBITS + 1);
-        let valptr = new Array(MAX_HUFFBITS + 1);
-        let marker = new Ref(this.getCMarkerWSQ(dataInput, TBLS_N_SOB));
-        let bitCount = new Ref(0);
-        let nextByte = new Ref(0);
+        const qdata = new Array(size);
+        const maxcode = new Array(MAX_HUFFBITS + 1);
+        const mincode = new Array(MAX_HUFFBITS + 1);
+        const valptr = new Array(MAX_HUFFBITS + 1);
+        const marker = new Ref(this.getCMarkerWSQ(dataInput, TBLS_N_SOB));
+        const bitCount = new Ref(0);
+        const nextByte = new Ref(0);
         let hufftableId = 0;
         let ip = 0;
         let isPrematureEOF = false;
@@ -454,14 +454,14 @@ class WSQDecoder {
                 hufftableId = this.getCBlockHeader(dataInput);
                 if (token.tableDHT[hufftableId].tabdef != 1)
                     throw new Error("ERROR : huffmanDecodeDataMem : huffman table undefined.");
-                let hufftable = this.buildHuffsizes(token.tableDHT[hufftableId].huffbits, MAX_HUFFCOUNTS_WSQ);
+                const hufftable = this.buildHuffsizes(token.tableDHT[hufftableId].huffbits, MAX_HUFFCOUNTS_WSQ);
                 this.buildHuffcodes(hufftable);
                 this.genDecodeTable(hufftable, maxcode, mincode, valptr, token.tableDHT[hufftableId].huffbits);
                 bitCount.value = 0;
                 marker.value = 0;
             }
             try {
-                let nodeptr = this.decodeDataMem(dataInput, mincode, maxcode, valptr, token.tableDHT[hufftableId].huffvalues, bitCount, marker, nextByte);
+                const nodeptr = this.decodeDataMem(dataInput, mincode, maxcode, valptr, token.tableDHT[hufftableId].huffvalues, bitCount, marker, nextByte);
                 if (nodeptr == -1)
                     continue;
                 if (nodeptr > 0 && nodeptr <= 100) {
@@ -509,7 +509,7 @@ class WSQDecoder {
             if (marker.value != 0)
                 return -1;
         }
-        let inx2 = valptr[inx] + code - mincode[inx];
+        const inx2 = valptr[inx] + code - mincode[inx];
         return huffvalues[inx2];
     }
     getCNextbitsWSQ(dataInput, marker, bitCount, bitsReq, nextByte) {
@@ -518,7 +518,7 @@ class WSQDecoder {
             this.offset += 1;
             bitCount.value = 8;
             if (nextByte.value == 0xFF) {
-                let code2 = dataInput.getUint8(this.offset);
+                const code2 = dataInput.getUint8(this.offset);
                 this.offset += 1;
                 if (code2 != 0x00 && bitsReq == 1) {
                     marker.value = (nextByte.value << 8) | code2;
@@ -565,7 +565,7 @@ class WSQDecoder {
     }
     buildHuffsizes(huffbits, maxHuffcounts) {
         let numberOfCodes = 1;
-        let huffcodeTable = new Array(maxHuffcounts + 1);
+        const huffcodeTable = new Array(maxHuffcounts + 1);
         let tempSize = 0;
         for (let codeSize = 1; codeSize <= MAX_HUFFBITS; codeSize++) {
             while (numberOfCodes <= huffbits[codeSize - 1]) {
@@ -603,12 +603,12 @@ class WSQDecoder {
     getCBlockHeader(dataInput) {
         dataInput.getUint16(this.offset);
         this.offset += 2;
-        let value = dataInput.getUint8(this.offset);
+        const value = dataInput.getUint8(this.offset);
         this.offset += 1;
         return value;
     }
     getCFrameHeaderWSQ(dataInput) {
-        let headerFrm = new HeaderFrm();
+        const headerFrm = new HeaderFrm();
         dataInput.getUint16(this.offset);
         this.offset += 2;
         headerFrm.black = dataInput.getUint8(this.offset);
@@ -688,7 +688,7 @@ class WSQDecoder {
         }
     }
     getCHuffmanTableWSQ(dataInput, token) {
-        let firstHuffmanTable = this.getCHuffmanTable(dataInput, token, MAX_HUFFCOUNTS_WSQ, 0, true);
+        const firstHuffmanTable = this.getCHuffmanTable(dataInput, token, MAX_HUFFCOUNTS_WSQ, 0, true);
         let tableId = firstHuffmanTable.tableId;
         token.tableDHT[tableId].huffbits = firstHuffmanTable.huffbits.slice();
         token.tableDHT[tableId].huffvalues = firstHuffmanTable.huffvalues.slice();
@@ -706,7 +706,7 @@ class WSQDecoder {
         }
     }
     getCHuffmanTable(dataInput, token, maxHuffcounts, bytesLeft, readTableLen) {
-        let huffmanTable = new HuffmanTable();
+        const huffmanTable = new HuffmanTable();
         if (readTableLen) {
             huffmanTable.tableLen = dataInput.getUint16(this.offset);
             this.offset += 2;
@@ -796,11 +796,11 @@ class WSQDecoder {
         const aLofilt = new Float32Array(aSize);
         aSize--;
         for (let cnt = 0; cnt <= aSize; cnt++) {
-            let sign = dataInput.getUint8(this.offset);
+            const sign = dataInput.getUint8(this.offset);
             this.offset += 1;
             let scale = dataInput.getUint8(this.offset);
             this.offset += 1;
-            let shrtDat = (dataInput.getInt32(this.offset) & 0xFFFFFFFF) >>> 0;
+            const shrtDat = (dataInput.getInt32(this.offset) & 0xFFFFFFFF) >>> 0;
             this.offset += 4;
             aLofilt[cnt] = shrtDat;
             while (scale > 0) {
@@ -826,11 +826,11 @@ class WSQDecoder {
         const aHifilt = new Float32Array(aSize);
         aSize--;
         for (let cnt = 0; cnt <= aSize; cnt++) {
-            let sign = dataInput.getUint8(this.offset);
+            const sign = dataInput.getUint8(this.offset);
             this.offset += 1;
             let scale = dataInput.getUint8(this.offset);
             this.offset += 1;
-            let shrtDat = (dataInput.getInt32(this.offset) & 0xFFFFFFFF) >>> 0;
+            const shrtDat = (dataInput.getInt32(this.offset) & 0xFFFFFFFF) >>> 0;
             this.offset += 4;
             aHifilt[cnt] = shrtDat;
             while (scale > 0) {
@@ -861,12 +861,13 @@ class WSQDecoder {
         return num;
     }
 }
+export const wsqToRAW = (data) => new WSQDecoder().decode(data);
 /**
  * Convert Wavelet Scalar Quantization (`.wsq`) to PNG
  * @param data WSQ buffer
  */
 export const wsqToPNG = (data) => {
-    const grayscale = new WSQDecoder().decode(data);
+    const grayscale = wsqToRAW(data);
     const rgba = new Uint8Array(grayscale.width * grayscale.height * 4);
     for (let i = 0; i < grayscale.width * grayscale.height; i++) {
         rgba[i * 4 + 0] = grayscale.pixels[i];
@@ -876,3 +877,4 @@ export const wsqToPNG = (data) => {
     }
     return new Uint8Array(UPNG.encode([rgba.buffer], grayscale.width, grayscale.height, 0));
 };
+export { BitmapWithMetadata } from "./bitmap.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@li0ard/wsq",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "type": "module",