cross-image 0.2.0 → 0.2.2

package/esm/src/formats/bmp.js

@@ -1,4 +1,5 @@
 import { validateImageDimensions } from "../utils/security.js";
+import { readInt32LE, readUint16LE, readUint32LE, writeInt32LE, writeUint16LE, writeUint32LE, } from "../utils/byte_utils.js";
 // Constants for unit conversions
 const INCHES_PER_METER = 39.3701;
 /**
@@ -42,10 +43,10 @@ export class BMPFormat {
             throw new Error("Invalid BMP signature");
         }
         // Read BMP file header (14 bytes)
-        const _fileSize = this.readUint32LE(data, 2);
-        const dataOffset = this.readUint32LE(data, 10);
+        const _fileSize = readUint32LE(data, 2);
+        const dataOffset = readUint32LE(data, 10);
         // Read DIB header (at least 40 bytes for BITMAPINFOHEADER)
-        const dibHeaderSize = this.readUint32LE(data, 14);
+        const dibHeaderSize = readUint32LE(data, 14);
         let width;
         let height;
         let bitDepth;
@@ -53,13 +54,13 @@ export class BMPFormat {
         const metadata = {};
         if (dibHeaderSize >= 40) {
             // BITMAPINFOHEADER or later
-            width = this.readInt32LE(data, 18);
-            height = this.readInt32LE(data, 22);
-            bitDepth = this.readUint16LE(data, 28);
-            compression = this.readUint32LE(data, 30);
+            width = readInt32LE(data, 18);
+            height = readInt32LE(data, 22);
+            bitDepth = readUint16LE(data, 28);
+            compression = readUint32LE(data, 30);
             // Read DPI information (pixels per meter)
-            const xPixelsPerMeter = this.readInt32LE(data, 38);
-            const yPixelsPerMeter = this.readInt32LE(data, 42);
+            const xPixelsPerMeter = readInt32LE(data, 38);
+            const yPixelsPerMeter = readInt32LE(data, 42);
             if (xPixelsPerMeter > 0 && yPixelsPerMeter > 0) {
                 // Convert pixels per meter to DPI
                 metadata.dpiX = Math.round(xPixelsPerMeter / INCHES_PER_METER);
@@ -134,21 +135,21 @@ export class BMPFormat {
         // BMP File Header (14 bytes)
         result[0] = 0x42; // 'B'
         result[1] = 0x4d; // 'M'
-        this.writeUint32LE(result, 2, fileSize); // File size
-        this.writeUint32LE(result, 6, 0); // Reserved
-        this.writeUint32LE(result, 10, 54); // Offset to pixel data (14 + 40)
+        writeUint32LE(result, 2, fileSize); // File size
+        writeUint32LE(result, 6, 0); // Reserved
+        writeUint32LE(result, 10, 54); // Offset to pixel data (14 + 40)
         // DIB Header (BITMAPINFOHEADER - 40 bytes)
-        this.writeUint32LE(result, 14, 40); // DIB header size
-        this.writeInt32LE(result, 18, width); // Width
-        this.writeInt32LE(result, 22, height); // Height (positive = bottom-up)
-        this.writeUint16LE(result, 26, 1); // Planes
-        this.writeUint16LE(result, 28, 32); // Bits per pixel
-        this.writeUint32LE(result, 30, 0); // Compression (0 = uncompressed)
-        this.writeUint32LE(result, 34, pixelDataSize); // Image size
-        this.writeInt32LE(result, 38, xPixelsPerMeter); // X pixels per meter
-        this.writeInt32LE(result, 42, yPixelsPerMeter); // Y pixels per meter
-        this.writeUint32LE(result, 46, 0); // Colors in palette
-        this.writeUint32LE(result, 50, 0); // Important colors
+        writeUint32LE(result, 14, 40); // DIB header size
+        writeInt32LE(result, 18, width); // Width
+        writeInt32LE(result, 22, height); // Height (positive = bottom-up)
+        writeUint16LE(result, 26, 1); // Planes
+        writeUint16LE(result, 28, 32); // Bits per pixel
+        writeUint32LE(result, 30, 0); // Compression (0 = uncompressed)
+        writeUint32LE(result, 34, pixelDataSize); // Image size
+        writeInt32LE(result, 38, xPixelsPerMeter); // X pixels per meter
+        writeInt32LE(result, 42, yPixelsPerMeter); // Y pixels per meter
+        writeUint32LE(result, 46, 0); // Colors in palette
+        writeUint32LE(result, 50, 0); // Important colors
         // Write pixel data (bottom-to-top, BGR(A) format)
         let offset = 54;
         for (let y = height - 1; y >= 0; y--) {
@@ -167,28 +168,4 @@ export class BMPFormat {
         }
         return Promise.resolve(result);
     }
-    readUint16LE(data, offset) {
-        return data[offset] | (data[offset + 1] << 8);
-    }
-    readUint32LE(data, offset) {
-        return data[offset] | (data[offset + 1] << 8) |
-            (data[offset + 2] << 16) | (data[offset + 3] << 24);
-    }
-    readInt32LE(data, offset) {
-        const value = this.readUint32LE(data, offset);
-        return value > 0x7fffffff ? value - 0x100000000 : value;
-    }
-    writeUint16LE(data, offset, value) {
-        data[offset] = value & 0xff;
-        data[offset + 1] = (value >>> 8) & 0xff;
-    }
-    writeUint32LE(data, offset, value) {
-        data[offset] = value & 0xff;
-        data[offset + 1] = (value >>> 8) & 0xff;
-        data[offset + 2] = (value >>> 16) & 0xff;
-        data[offset + 3] = (value >>> 24) & 0xff;
-    }
-    writeInt32LE(data, offset, value) {
-        this.writeUint32LE(data, offset, value < 0 ? value + 0x100000000 : value);
-    }
 }

package/esm/src/formats/dng.js

@@ -78,7 +78,7 @@ export class DNGFormat extends TIFFFormat {
      * @param imageData Image data to encode
      * @returns Encoded DNG image bytes
      */
-    async encode(imageData) {
+    encode(imageData) {
         const { width, height, data } = imageData;
         // We'll create a Linear DNG (demosaiced RGB)
         // This is very similar to a standard TIFF but with specific tags.
@@ -124,7 +124,7 @@ export class DNGFormat extends TIFFFormat {
         // 4. BitsPerSample (0x0102) - 8, 8, 8, 8
         this.writeIFDEntry(result, 0x0102, 3, 4, dataOffset);
         // Write the actual values later
-        const bitsPerSampleOffset = dataOffset;
+        const _bitsPerSampleOffset = dataOffset;
         dataOffset += 8; // 4 * 2 bytes
         // 5. Compression (0x0103) - 1 = Uncompressed
         this.writeIFDEntry(result, 0x0103, 3, 1, 1);
@@ -161,7 +161,7 @@ export class DNGFormat extends TIFFFormat {
         const modelName = "Cross Image DNG\0";
         const modelNameBytes = new TextEncoder().encode(modelName);
         this.writeIFDEntry(result, 50708, 2, modelNameBytes.length, dataOffset);
-        const modelNameOffset = dataOffset;
+        const _modelNameOffset = dataOffset;
         dataOffset += modelNameBytes.length;
         // Next IFD offset (0)
         this.writeUint32LE(result, 0);
@@ -186,6 +186,6 @@ export class DNGFormat extends TIFFFormat {
         for (let i = 0; i < modelNameBytes.length; i++) {
             result.push(modelNameBytes[i]);
         }
-        return new Uint8Array(result);
+        return Promise.resolve(new Uint8Array(result));
     }
 }

package/esm/src/formats/gif.d.ts

@@ -46,11 +46,9 @@ export declare class GIFFormat implements ImageFormat {
     decodeFrames(data: Uint8Array): Promise<MultiFrameImageData>;
     /**
      * Encode multi-frame image data to animated GIF
-     * Note: Currently not implemented, will encode only first frame
      */
     encodeFrames(imageData: MultiFrameImageData, _options?: unknown): Promise<Uint8Array>;
     private mapDisposalMethod;
-    private readUint16LE;
     private decodeUsingRuntime;
     private readDataSubBlocks;
     private parseComment;

package/esm/src/formats/gif.js

@@ -1,6 +1,7 @@
 import { GIFDecoder } from "../utils/gif_decoder.js";
 import { GIFEncoder } from "../utils/gif_encoder.js";
 import { validateImageDimensions } from "../utils/security.js";
+import { readUint16LE } from "../utils/byte_utils.js";
 /**
  * GIF format handler
  * Now includes pure-JS implementation with custom LZW compression/decompression
@@ -78,9 +79,9 @@ export class GIFFormat {
             // Fall back to runtime decoder if pure-JS fails
             console.warn("Pure-JS GIF decoder failed, falling back to runtime:", error);
             let pos = 6; // Skip "GIF89a" or "GIF87a"
-            const width = this.readUint16LE(data, pos);
+            const width = readUint16LE(data, pos);
             pos += 2;
-            const height = this.readUint16LE(data, pos);
+            const height = readUint16LE(data, pos);
             // Validate dimensions for security (prevent integer overflow and heap exhaustion)
             validateImageDimensions(width, height);
             const rgba = await this.decodeUsingRuntime(data, width, height);
@@ -231,22 +232,18 @@ export class GIFFormat {
     }
     /**
      * Encode multi-frame image data to animated GIF
-     * Note: Currently not implemented, will encode only first frame
      */
     encodeFrames(imageData, _options) {
-        // For now, just encode the first frame using the existing encoder
-        // Full multi-frame encoding would require a more complex GIFEncoder
         if (imageData.frames.length === 0) {
             throw new Error("No frames to encode");
         }
-        const firstFrame = imageData.frames[0];
-        const singleFrameData = {
-            width: firstFrame.width,
-            height: firstFrame.height,
-            data: firstFrame.data,
-            metadata: imageData.metadata,
-        };
-        return this.encode(singleFrameData);
+        const encoder = new GIFEncoder(imageData.width, imageData.height);
+        for (const frame of imageData.frames) {
+            // Get delay from metadata (default to 100ms if not set)
+            const delay = frame.frameMetadata?.delay ?? 100;
+            encoder.addFrame(frame.data, delay);
+        }
+        return Promise.resolve(encoder.encode());
     }
     mapDisposalMethod(disposal) {
         switch (disposal) {
@@ -261,9 +258,6 @@ export class GIFFormat {
                 return "none";
         }
     }
-    readUint16LE(data, offset) {
-        return data[offset] | (data[offset + 1] << 8);
-    }
     async decodeUsingRuntime(data, _width, _height) {
         // Try to use ImageDecoder API if available (Deno, modern browsers)
         if (typeof ImageDecoder !== "undefined") {

package/esm/src/formats/ico.d.ts

@@ -0,0 +1,41 @@
+import type { ImageData, ImageFormat } from "../types.js";
+/**
+ * ICO format handler
+ * Implements a pure JavaScript ICO (Windows Icon) decoder and encoder
+ *
+ * ICO files can contain multiple images at different sizes.
+ * This implementation decodes the largest image and encodes as a single-image ICO.
+ */
+export declare class ICOFormat implements ImageFormat {
+    /** Format name identifier */
+    readonly name = "ico";
+    /** MIME type for ICO images */
+    readonly mimeType = "image/x-icon";
+    private pngFormat;
+    /**
+     * Check if the given data is an ICO image
+     * @param data Raw image data to check
+     * @returns true if data has ICO/CUR signature
+     */
+    canDecode(data: Uint8Array): boolean;
+    /**
+     * Decode ICO image data to RGBA
+     * Selects and decodes the largest image in the ICO file
+     * @param data Raw ICO image data
+     * @returns Decoded image data with RGBA pixels
+     */
+    decode(data: Uint8Array): Promise<ImageData>;
+    /**
+     * Decode a DIB (Device Independent Bitmap) format
+     * This is a BMP without the 14-byte file header
+     */
+    private decodeDIB;
+    /**
+     * Encode RGBA image data to ICO format
+     * Creates an ICO file with a single PNG-encoded image
+     * @param imageData Image data to encode
+     * @returns Encoded ICO image bytes
+     */
+    encode(imageData: ImageData): Promise<Uint8Array>;
+}
+//# sourceMappingURL=ico.d.ts.map

package/esm/src/formats/ico.js

@@ -0,0 +1,214 @@
+import { validateImageDimensions } from "../utils/security.js";
+import { PNGFormat } from "./png.js";
+import { readInt32LE, readUint16LE, readUint32LE, writeUint16LE, writeUint32LE, } from "../utils/byte_utils.js";
+/**
+ * ICO format handler
+ * Implements a pure JavaScript ICO (Windows Icon) decoder and encoder
+ *
+ * ICO files can contain multiple images at different sizes.
+ * This implementation decodes the largest image and encodes as a single-image ICO.
+ */
+export class ICOFormat {
+    constructor() {
+        /** Format name identifier */
+        Object.defineProperty(this, "name", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "ico"
+        });
+        /** MIME type for ICO images */
+        Object.defineProperty(this, "mimeType", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: "image/x-icon"
+        });
+        Object.defineProperty(this, "pngFormat", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: new PNGFormat()
+        });
+    }
+    /**
+     * Check if the given data is an ICO image
+     * @param data Raw image data to check
+     * @returns true if data has ICO/CUR signature
+     */
+    canDecode(data) {
+        // ICO signature: reserved=0, type=1 (icon) or 2 (cursor)
+        return data.length >= 6 &&
+            data[0] === 0 && data[1] === 0 && // Reserved
+            (data[2] === 1 || data[2] === 2) && data[3] === 0 && // Type = 1 (icon) or 2 (cursor)
+            data[4] !== 0; // Count > 0
+    }
+    /**
+     * Decode ICO image data to RGBA
+     * Selects and decodes the largest image in the ICO file
+     * @param data Raw ICO image data
+     * @returns Decoded image data with RGBA pixels
+     */
+    async decode(data) {
+        if (!this.canDecode(data)) {
+            throw new Error("Invalid ICO signature");
+        }
+        // Read ICONDIR header
+        const count = readUint16LE(data, 4);
+        if (count === 0) {
+            throw new Error("ICO file contains no images");
+        }
+        // Read all ICONDIRENTRY structures (16 bytes each, starting at offset 6)
+        const entries = [];
+        for (let i = 0; i < count; i++) {
+            const entryOffset = 6 + i * 16;
+            if (entryOffset + 16 > data.length) {
+                throw new Error("Invalid ICO file: entry data out of bounds");
+            }
+            let width = data[entryOffset]; // 0 means 256
+            let height = data[entryOffset + 1]; // 0 means 256
+            // Width/height of 0 means 256 pixels
+            if (width === 0)
+                width = 256;
+            if (height === 0)
+                height = 256;
+            const size = readUint32LE(data, entryOffset + 8);
+            const offset = readUint32LE(data, entryOffset + 12);
+            entries.push({ width, height, size, offset });
+        }
+        // Find the largest image (by area)
+        let largestEntry = entries[0];
+        let largestArea = largestEntry.width * largestEntry.height;
+        for (const entry of entries) {
+            const area = entry.width * entry.height;
+            if (area > largestArea) {
+                largestEntry = entry;
+                largestArea = area;
+            }
+        }
+        // Extract image data
+        const imageStart = largestEntry.offset;
+        const imageEnd = imageStart + largestEntry.size;
+        if (imageEnd > data.length) {
+            throw new Error("Invalid ICO file: image data out of bounds");
+        }
+        const imageData = data.slice(imageStart, imageEnd);
+        // Check if it's a PNG (starts with PNG signature)
+        if (imageData.length >= 8 &&
+            imageData[0] === 0x89 &&
+            imageData[1] === 0x50 &&
+            imageData[2] === 0x4e &&
+            imageData[3] === 0x47) {
+            // It's a PNG, decode it
+            return await this.pngFormat.decode(imageData);
+        }
+        // Otherwise, it's a BMP without the file header (DIB format)
+        return this.decodeDIB(imageData);
+    }
+    /**
+     * Decode a DIB (Device Independent Bitmap) format
+     * This is a BMP without the 14-byte file header
+     */
+    decodeDIB(data) {
+        // Read DIB header
+        const dibHeaderSize = readUint32LE(data, 0);
+        if (dibHeaderSize < 40) {
+            throw new Error("Unsupported DIB header size");
+        }
+        const width = readInt32LE(data, 4);
+        const height = readInt32LE(data, 8);
+        const bitDepth = readUint16LE(data, 14);
+        const compression = readUint32LE(data, 16);
+        // Validate dimensions
+        validateImageDimensions(width, Math.abs(height) / 2); // DIB height includes both XOR and AND mask data
+        // ICO files store height as 2x actual height (for AND mask)
+        const actualHeight = Math.abs(height) / 2;
+        // Only support uncompressed DIBs
+        if (compression !== 0) {
+            throw new Error(`Compressed DIB not supported (compression: ${compression})`);
+        }
+        // Support common bit depths
+        if (bitDepth !== 24 && bitDepth !== 32) {
+            throw new Error(`Unsupported bit depth: ${bitDepth}`);
+        }
+        // Calculate data offset (after header and optional color table)
+        const dataOffset = dibHeaderSize;
+        // Calculate row size (must be multiple of 4 bytes)
+        const bytesPerPixel = bitDepth / 8;
+        const rowSize = Math.floor((bitDepth * width + 31) / 32) * 4;
+        // Read XOR mask (color data)
+        const rgba = new Uint8Array(width * actualHeight * 4);
+        for (let y = 0; y < actualHeight; y++) {
+            // DIB data is stored bottom-to-top
+            const rowIndex = actualHeight - 1 - y;
+            const rowOffset = dataOffset + y * rowSize;
+            for (let x = 0; x < width; x++) {
+                const pixelOffset = rowOffset + x * bytesPerPixel;
+                const outIndex = (rowIndex * width + x) * 4;
+                // DIB stores pixels as BGR(A)
+                rgba[outIndex] = data[pixelOffset + 2]; // R
+                rgba[outIndex + 1] = data[pixelOffset + 1]; // G
+                rgba[outIndex + 2] = data[pixelOffset]; // B
+                rgba[outIndex + 3] = bitDepth === 32 ? data[pixelOffset + 3] : 255; // A
+            }
+        }
+        // Read AND mask if present (for transparency in 24-bit images)
+        if (bitDepth === 24) {
+            const andMaskOffset = dataOffset + rowSize * actualHeight;
+            const andMaskRowSize = Math.floor((width + 31) / 32) * 4;
+            for (let y = 0; y < actualHeight; y++) {
+                const rowIndex = actualHeight - 1 - y;
+                const rowOffset = andMaskOffset + y * andMaskRowSize;
+                for (let x = 0; x < width; x++) {
+                    const byteOffset = rowOffset + Math.floor(x / 8);
+                    const bitOffset = 7 - (x % 8);
+                    const isTransparent = (data[byteOffset] & (1 << bitOffset)) !== 0;
+                    if (isTransparent) {
+                        const outIndex = (rowIndex * width + x) * 4 + 3;
+                        rgba[outIndex] = 0; // Set alpha to 0 for transparent pixels
+                    }
+                }
+            }
+        }
+        return Promise.resolve({
+            width,
+            height: actualHeight,
+            data: rgba,
+        });
+    }
+    /**
+     * Encode RGBA image data to ICO format
+     * Creates an ICO file with a single PNG-encoded image
+     * @param imageData Image data to encode
+     * @returns Encoded ICO image bytes
+     */
+    async encode(imageData) {
+        const { width, height } = imageData;
+        // Encode the image as PNG
+        const pngData = await this.pngFormat.encode(imageData);
+        // Create ICO file structure
+        // ICONDIR (6 bytes) + ICONDIRENTRY (16 bytes) + PNG data
+        const icoSize = 6 + 16 + pngData.length;
+        const result = new Uint8Array(icoSize);
+        // Write ICONDIR header
+        result[0] = 0; // Reserved
+        result[1] = 0; // Reserved
+        result[2] = 1; // Type = 1 (icon)
+        result[3] = 0; // Type high byte
+        result[4] = 1; // Count = 1
+        result[5] = 0; // Count high byte
+        // Write ICONDIRENTRY
+        const entryOffset = 6;
+        result[entryOffset] = width >= 256 ? 0 : width; // Width (0 = 256)
+        result[entryOffset + 1] = height >= 256 ? 0 : height; // Height (0 = 256)
+        result[entryOffset + 2] = 0; // Color count (0 = no palette)
+        result[entryOffset + 3] = 0; // Reserved
+        writeUint16LE(result, entryOffset + 4, 1); // Color planes
+        writeUint16LE(result, entryOffset + 6, 32); // Bits per pixel
+        writeUint32LE(result, entryOffset + 8, pngData.length); // Image size
+        writeUint32LE(result, entryOffset + 12, 22); // Image offset (6 + 16)
+        // Write PNG data
+        result.set(pngData, 22);
+        return result;
+    }
+}

package/esm/src/formats/pcx.js

@@ -155,7 +155,7 @@ export class PCXFormat {
         view.setUint16(66, width + (width % 2), true); // BytesPerLine (must be even)
         view.setUint16(68, 1, true); // PaletteInfo (Color/BW)
         const bytesPerLine = width + (width % 2);
-        const scanlineLength = bytesPerLine * 3;
+        const _scanlineLength = bytesPerLine * 3;
         const rleData = [];
         // Helper to write RLE
         const writeRLE = (byte, count) => {

package/esm/src/formats/png.d.ts

@@ -1,9 +1,10 @@
 import type { ImageData, ImageFormat } from "../types.js";
+import { PNGBase } from "./png_base.js";
 /**
  * PNG format handler
  * Implements a pure JavaScript PNG decoder and encoder
  */
-export declare class PNGFormat implements ImageFormat {
+export declare class PNGFormat extends PNGBase implements ImageFormat {
     /** Format name identifier */
     readonly name = "png";
     /** MIME type for PNG images */
@@ -26,25 +27,5 @@ export declare class PNGFormat implements ImageFormat {
      * @returns Encoded PNG image bytes
      */
     encode(imageData: ImageData): Promise<Uint8Array>;
-    private readUint32;
-    private writeUint32;
-    private concatenateChunks;
-    private inflate;
-    private deflate;
-    private unfilterAndConvert;
-    private unfilterScanline;
-    private paethPredictor;
-    private filterData;
-    private getBytesPerPixel;
-    private getBitsPerPixel;
-    private createChunk;
-    private crc32;
-    private parsePhysChunk;
-    private parseTextChunk;
-    private parseITxtChunk;
-    private parseExifChunk;
-    private createPhysChunk;
-    private createTextChunk;
-    private createExifChunk;
 }
 //# sourceMappingURL=png.d.ts.map