ag-psd 32.0.0 → 34.0.0

package/dist-es/psdReader.js

@@ -12,6 +12,10 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.supportedColorModes = void 0;
+exports.getUtf8Decoder = getUtf8Decoder;
+exports.getUtf8StrictDecoder = getUtf8StrictDecoder;
+exports.getGbkStrictDecoder = getGbkStrictDecoder;
+exports.decodeUtf8 = decodeUtf8;
 exports.createReader = createReader;
 exports.warnOrThrow = warnOrThrow;
 exports.readUint8 = readUint8;
@@ -53,12 +57,15 @@ exports.readDataZip = readDataZip;
 exports.readDataRLE = readDataRLE;
 exports.readSection = readSection;
 exports.readColor = readColor;
+exports.readPatternSafe = readPatternSafe;
 exports.readPattern = readPattern;
+exports.consumeMemory = consumeMemory;
 const pako_1 = require("pako");
 const helpers_1 = require("./helpers");
 const additionalInfo_1 = require("./additionalInfo");
+const utf8_1 = require("./utf8");
 const imageResources_1 = require("./imageResources");
-exports.supportedColorModes = [0 /* ColorMode.Bitmap */, 1 /* ColorMode.Grayscale */, 3 /* ColorMode.RGB */, 2 /* ColorMode.Indexed */];
+exports.supportedColorModes = [0 /* ColorMode.Bitmap */, 1 /* ColorMode.Grayscale */, 3 /* ColorMode.RGB */, 2 /* ColorMode.Indexed */, 4 /* ColorMode.CMYK */];
 const colorModes = ['bitmap', 'grayscale', 'indexed', 'RGB', 'CMYK', '', '', 'multichannel', 'duotone', 'lab'];
 function setupGrayscale(data) {
     const size = data.width * data.height * 4;
@@ -68,6 +75,37 @@ function setupGrayscale(data) {
         data.data[i + 2] = c;
     }
 }
+function createTextDecoder(label, options) {
+    try {
+        return typeof TextDecoder !== 'undefined' ? new TextDecoder(label, options) : null;
+    }
+    catch (_a) {
+        return null; // encoding not supported
+    }
+}
+// non-fatal UTF-8 decoder, malformed byte sequences are replaced with U+FFFD
+function getUtf8Decoder(reader) {
+    if (reader.utf8Decoder === undefined)
+        reader.utf8Decoder = createTextDecoder('utf-8', { ignoreBOM: true });
+    return reader.utf8Decoder;
+}
+// UTF-8 decoder that throws on malformed byte sequences
+function getUtf8StrictDecoder(reader) {
+    if (reader.utf8StrictDecoder === undefined)
+        reader.utf8StrictDecoder = createTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+    return reader.utf8StrictDecoder;
+}
+// GBK decoder that throws on malformed byte sequences
+function getGbkStrictDecoder(reader) {
+    if (reader.gbkDecoder === undefined)
+        reader.gbkDecoder = createTextDecoder('gbk', { fatal: true });
+    return reader.gbkDecoder;
+}
+function decodeUtf8(reader, buffer) {
+    // native decoder is faster only for longer strings
+    const decoder = buffer.byteLength > 1000 ? getUtf8Decoder(reader) : null;
+    return decoder ? decoder.decode(buffer) : (0, utf8_1.decodeString)(buffer);
+}
 function createReader(buffer, offset, length) {
     const view = new DataView(buffer, offset, length);
     return { view, offset: 0, strict: false, debug: false, large: false, globalAlpha: false, log: console.log };
@@ -168,6 +206,8 @@ function readUnicodeString(reader) {
     return readUnicodeStringWithLength(reader, length);
 }
 const STRING_CHUNK_SIZE = 0x2000;
+// shorter strings (most descriptor keys, OSTypes and names) are faster to build with simple loop than String.fromCharCode.apply
+const SHORT_STRING_LENGTH = 64;
 function checkReadBounds(reader, size) {
     if (reader.offset < 0 || (reader.offset + size) > reader.view.byteLength) {
         throw new RangeError('Offset is outside the bounds of the DataView');
@@ -178,9 +218,18 @@ function readUtf16String(reader, length, littleEndian) {
         return '';
     checkReadBounds(reader, length * 2);
     const view = reader.view;
-    const codes = new Uint16Array(Math.min(length, STRING_CHUNK_SIZE));
     let offset = reader.offset;
     let text = '';
+    if (length <= SHORT_STRING_LENGTH) {
+        for (let i = 0; i < length; i++, offset += 2) {
+            text += String.fromCharCode(view.getUint16(offset, littleEndian));
+        }
+        reader.offset = offset;
+        if (text.charCodeAt(text.length - 1) === 0)
+            text = text.substring(0, text.length - 1);
+        return text;
+    }
+    const codes = new Uint16Array(Math.min(length, STRING_CHUNK_SIZE));
     for (let i = 0; i < length; i += STRING_CHUNK_SIZE) {
         const count = Math.min(STRING_CHUNK_SIZE, length - i);
         for (let j = 0; j < count; j++, offset += 2) {
@@ -211,6 +260,15 @@ function readAsciiString(reader, length) {
     if (!(length > 0))
         return '';
     checkReadBounds(reader, length);
+    if (length <= SHORT_STRING_LENGTH) {
+        const view = reader.view;
+        let text = '';
+        for (let i = 0, offset = reader.offset; i < length; i++, offset++) {
+            text += String.fromCharCode(view.getUint8(offset));
+        }
+        reader.offset += length;
+        return text;
+    }
     const text = bytesToString(new Uint8Array(reader.view.buffer, reader.view.byteOffset + reader.offset, length));
     reader.offset += length;
     return text;
@@ -226,7 +284,14 @@ function checkSignature(reader, a, b) {
     }
 }
 function readShortString(reader, length) {
-    return bytesToString(readBytes(reader, length));
+    const bytes = readBytes(reader, length);
+    if (length > SHORT_STRING_LENGTH)
+        return bytesToString(bytes);
+    let text = '';
+    for (let i = 0; i < bytes.length; i++) {
+        text += String.fromCharCode(bytes[i]);
+    }
+    return text;
 }
 function isValidSignature(sig) {
     return sig === '8BIM' || sig === 'MeSa' || sig === 'AgHg' || sig === 'PHUT' || sig === 'DCSR';
@@ -247,7 +312,8 @@ function readPsd(reader, readOptions = {}) {
     const maxSize = version === 1 ? 30000 : 300000;
     if (width > maxSize || height > maxSize)
         throw new Error(`Invalid size: ${width}x${height}`);
-    if (channels < 1 || channels > 56)
+    // up to 56 channels plus transparency of composite image (Photoshop CS3 writes 57 channels for 53 alpha channels)
+    if (channels < 1 || channels > 57)
         throw new Error(`Invalid channel count: ${channels}`);
     if (![1, 8, 16, 32].includes(bitsPerChannel))
         throw new Error(`Invalid bitsPerChannel: ${bitsPerChannel}`);
@@ -257,6 +323,7 @@ function readPsd(reader, readOptions = {}) {
     Object.assign(reader, readOptions);
     reader.large = version === 2;
     reader.globalAlpha = false;
+    reader.layersInGlobalInfo = false;
     if (!('totalMemoryLimit' in reader)) { // setting totalMemoryLimit to undefined explicitly disables memory limit
         reader.totalMemoryLimit = 2 * 1024 * 1024 * 1024; // default 2GB memory limit
     }
@@ -284,17 +351,21 @@ function readPsd(reader, readOptions = {}) {
     });
     // image resources
     const imageResources = {};
+    let unreadResourceBytes = 0;
     readSection(reader, 1, left => {
-        while (left() > 0) {
-            realignWithSignature(reader, isValidSignature);
+        // stop if there's not enough data left for resource header (some files have few trailing bytes in this section)
+        while (left() >= 12) {
+            const signature = realignWithSignature(reader, isValidSignature);
             const id = readUint16(reader);
-            readPascalString(reader, 2); // name
+            const nameLength = readUint8(reader);
+            const name = readBytes(reader, nameLength);
+            skipBytes(reader, (nameLength + 1) % 2); // pad to even size
             readSection(reader, 2, left => {
                 const handler = imageResources_1.resourceHandlersMap[id];
                 const skip = id === 1036 && !!reader.skipThumbnail;
                 if (handler && !skip) {
                     try {
-                        handler.read(reader, imageResources, left);
+                        handler.read(reader, imageResources, left, { signature, id, name, width, height });
                     }
                     catch (e) {
                         if (reader.throwForMissingFeatures)
@@ -303,13 +374,20 @@ function readPsd(reader, readOptions = {}) {
                     }
                 }
                 else {
-                    // options.logMissingFeatures && console.log(`Unhandled image resource: ${id} (${left()})`);
+                    reader.logMissingFeatures && reader.log(`Unhandled image resource: ${id} (${left()})`);
                     skipBytes(reader, left());
                 }
             });
         }
+        unreadResourceBytes = left();
+        skipBytes(reader, left());
     });
-    const { layersGroup, layerGroupsEnabledId } = imageResources, rest = __rest(imageResources, ["layersGroup", "layerGroupsEnabledId"]);
+    // some files have image resources section length few bytes larger than the data, layer and mask info section
+    // starts right after the last resource in that case
+    if (unreadResourceBytes && !sectionFits(reader, reader.offset) && sectionFits(reader, reader.offset - unreadResourceBytes)) {
+        reader.offset -= unreadResourceBytes;
+    }
+    const { layersGroup, layerGroupsEnabledId, savedPathsOrigination } = imageResources, rest = __rest(imageResources, ["layersGroup", "layerGroupsEnabledId", "savedPathsOrigination"]);
     if (Object.keys(rest).length) {
         psd.imageResources = rest;
     }
@@ -353,6 +431,8 @@ function readPsd(reader, readOptions = {}) {
             const rawCompositeData = new Uint8Array(reader.view.buffer, reader.view.byteOffset + rawOffset, reader.view.byteLength - rawOffset);
             psd.rawCompositeData = rawCompositeData;
             psd.rawCompositeDataInfo = { large: reader.large, globalAlpha: reader.globalAlpha };
+            if (reader.layersInGlobalInfo)
+                psd.rawCompositeDataInfo.layersInGlobalInfo = true;
         }
         else {
             const imageData = readImageData(reader, psd);
@@ -364,9 +444,6 @@ function readPsd(reader, readOptions = {}) {
             }
         }
     }
-    // TODO: show converted color mode instead of original PSD file color mode
-    //       but add option to preserve file color mode (need to return image data instead of canvas in that case)
-    // psd.colorMode = ColorMode.RGB; // we convert all color modes to RGB
     return psd;
 }
 function readLayerInfo(reader, psd, imageResources) {
@@ -400,6 +477,9 @@ function readLayerInfo(reader, psd, imageResources) {
         if (type === 1 /* SectionDividerType.OpenFolder */ || type === 2 /* SectionDividerType.ClosedFolder */) {
             l.opened = type === 1 /* SectionDividerType.OpenFolder */;
             l.children = [];
+            // group layers can't have image data, some broken files have it, ignore it like Photoshop does
+            delete l.canvas;
+            delete l.imageData;
             if ((_a = l.sectionDivider) === null || _a === void 0 ? void 0 : _a.key) {
                 l.blendMode = (_b = helpers_1.toBlendMode[l.sectionDivider.key]) !== null && _b !== void 0 ? _b : l.blendMode;
             }
@@ -442,9 +522,12 @@ function readLayerRecord(reader, psd, imageResources) {
     }
     checkSignature(reader, '8BIM');
     const blendMode = readSignature(reader);
-    if (!helpers_1.toBlendMode[blendMode])
-        throw new Error(`Invalid blend mode: '${blendMode}'`);
-    layer.blendMode = helpers_1.toBlendMode[blendMode];
+    if (!helpers_1.toBlendMode[blendMode]) {
+        if (reader.throwForMissingFeatures)
+            throw new Error(`Invalid blend mode: '${blendMode}'`);
+        reader.logMissingFeatures && reader.log(`Unknown blend mode: '${blendMode}', using normal blend mode`);
+    }
+    layer.blendMode = helpers_1.toBlendMode[blendMode] || 'normal';
     layer.opacity = readUint8(reader) / 0xff;
     layer.clipping = readUint8(reader) === 1;
     const flags = readUint8(reader);
@@ -472,11 +555,20 @@ function readLayerRecord(reader, psd, imageResources) {
     });
     return { layer, channels };
 }
+// negative sizes are treated as empty (Photoshop writes them for some empty layers, like 0,0,-1,0 bounds of fill layer)
+// checks if length of section (layer and mask info) at given offset fits in the file
+function sectionFits(reader, offset) {
+    const lengthSize = reader.large ? 8 : 4;
+    if (offset < 0 || offset + lengthSize > reader.view.byteLength)
+        return false;
+    const length = reader.large ? reader.view.getUint32(offset) * 0x100000000 + reader.view.getUint32(offset + 4) : reader.view.getUint32(offset);
+    return offset + lengthSize + length <= reader.view.byteLength;
+}
 function isValidBoxSize(box, reader) {
     const width = (box.right || 0) - (box.left || 0);
     const height = (box.bottom || 0) - (box.top || 0);
     const maxSize = reader.large ? 300000 : 30000;
-    return width >= 0 && height >= 0 && width <= maxSize && height <= maxSize;
+    return width <= maxSize && height <= maxSize;
 }
 function readLayerMaskData(reader, layer) {
     return readSection(reader, 1, left => {
@@ -586,18 +678,17 @@ function readLayerChannelImageData(reader, psd, layer, channels) {
         const start = reader.offset;
         let compression = 0 /* Compression.RawData */;
         let data = undefined;
-        if (channel.length === 1)
-            throw new Error('Invalid channel length');
-        if (channel.length) {
+        // channel length of 1 is invalid (should be 0 or at least 2), skip the byte and treat channel as empty
+        if (channel.length >= 2) {
             compression = readUint16(reader);
             // try to fix broken files where there's 1 byte shift of channel
             if (compression > 3) {
                 reader.offset -= 1;
                 compression = readUint16(reader);
             }
-            // try to fix broken files where there's 1 byte shift of channel
+            // try to fix broken files where there's 1 byte shift of channel (in the other direction)
             if (compression > 3) {
-                reader.offset -= 3;
+                reader.offset -= 4;
                 compression = readUint16(reader);
             }
             if (compression > 3)
@@ -610,7 +701,16 @@ function readLayerChannelImageData(reader, psd, layer, channels) {
         layer.rawData.channels.push({ id: channel.id, compression, data });
     }
     if (!reader.useRawData) {
-        decodeLayerImageData(layer, reader);
+        try {
+            decodeLayerImageData(layer, reader);
+        }
+        catch (e) {
+            // corrupted image data of one layer shouldn't prevent reading rest of the file
+            if (reader.throwForMissingFeatures || e.message === 'Exceeded memory limit')
+                throw e;
+            reader.logMissingFeatures && reader.log(`Failed to decode layer image data: ${e.message}`);
+            delete layer.rawData;
+        }
     }
 }
 function resetAlpha({ data }, cmyk) {
@@ -631,6 +731,7 @@ function getCompositeImageData(psd) {
     if (info) {
         reader.large = info.large;
         reader.globalAlpha = info.globalAlpha;
+        reader.layersInGlobalInfo = !!info.layersInGlobalInfo;
     }
     return readImageData(reader, psd);
 }
@@ -711,18 +812,14 @@ function getDataFromLayer(layer, read, throwForMissingFeatures, memoryLimit, log
     let initializedAlpha = false;
     if (layerWidth && layerHeight && read === LayerDataType.Layer) {
         if (cmyk) {
-            if (bitsPerChannel !== 8)
+            if (bitsPerChannel !== 8 && bitsPerChannel !== 16)
                 throw new Error('bitsPerChannel not supported');
-            imageData = { width: layerWidth, height: layerHeight, data: new Uint8ClampedArray(layerWidth * layerHeight * 5) };
+            imageData = createImageDataBitDepth(layerWidth, layerHeight, bitsPerChannel, 5, memoryLimit);
         }
         else {
             imageData = createImageDataBitDepth(layerWidth, layerHeight, bitsPerChannel, 4, memoryLimit);
         }
     }
-    if (helpers_1.RAW_IMAGE_DATA) { // TODO: use layer.rawData instead
-        layer.imageDataRaw = [];
-        layer.imageDataRawCompression = [];
-    }
     for (const { id, compression, data } of channels) {
         if (!data)
             continue;
@@ -747,16 +844,6 @@ function getDataFromLayer(layer, read, throwForMissingFeatures, memoryLimit, log
                 if (memoryLimit !== undefined)
                     dataReader.totalMemoryLimit = Math.max(0, dataReader.totalMemoryLimit - maskData.data.byteLength);
                 readData(dataReader, data.byteLength, maskData, compression, maskWidth, maskHeight, bitsPerChannel, 0, large, 4);
-                if (helpers_1.RAW_IMAGE_DATA) { // TODO: use layer.rawData instead
-                    if (id === -2 /* ChannelID.UserMask */) {
-                        layer.maskDataRawCompression = compression;
-                        layer.maskDataRaw = data;
-                    }
-                    else {
-                        layer.realMaskDataRawCompression = compression;
-                        layer.realMaskDataRaw = data;
-                    }
-                }
                 setupGrayscale(maskData);
                 resetAlpha(maskData, false);
             }
@@ -773,10 +860,6 @@ function getDataFromLayer(layer, read, throwForMissingFeatures, memoryLimit, log
                 }
             }
             readData(dataReader, data.byteLength, targetData, compression, layerWidth, layerHeight, bitsPerChannel, offset, large, cmyk ? 5 : 4);
-            if (helpers_1.RAW_IMAGE_DATA) { // TODO: use layer.rawData instead
-                layer.imageDataRawCompression[id] = compression;
-                layer.imageDataRaw[id] = data;
-            }
         }
         if (id === -1 /* ChannelID.Transparency */) {
             initializedAlpha = true;
@@ -789,7 +872,8 @@ function getDataFromLayer(layer, read, throwForMissingFeatures, memoryLimit, log
             resetAlpha(imageData, cmyk);
         if (cmyk) {
             const cmykData = imageData;
-            imageData = (0, helpers_1.createImageData)(cmykData.width, cmykData.height);
+            const rgbMemoryLimit = memoryLimit === undefined ? undefined : Math.max(0, memoryLimit - cmykData.data.byteLength);
+            imageData = createImageDataBitDepth(cmykData.width, cmykData.height, bitsPerChannel, 4, rgbMemoryLimit);
             cmykToRgb(cmykData, imageData, false);
         }
     }
@@ -830,7 +914,7 @@ function readGlobalLayerMaskInfo(reader) {
         const colorSpace2 = readUint16(reader);
         const colorSpace3 = readUint16(reader);
         const colorSpace4 = readUint16(reader);
-        const opacity = readUint16(reader) / 100; // 0 - 100
+        const opacity = Math.min(readUint16(reader), 100) / 100; // 0 - 100 (some files have values out of range)
         const kind = readUint8(reader);
         skipBytes(reader, left()); // 3 bytes of padding ?
         return { overlayColorSpace, colorSpace1, colorSpace2, colorSpace3, colorSpace4, opacity, kind };
@@ -862,7 +946,15 @@ function readAdditionalLayerInfo(reader, target, psd, imageResources) {
     const sig = realignWithSignature(reader, isValidAdditionalInfoSignature);
     const key = readSignature(reader);
     // `largeAdditionalInfoKeys` fallback, because some keys don't have 8B64 signature even when they are 64bit
-    const u64 = sig === '8B64' || (reader.large && helpers_1.largeAdditionalInfoKeys.indexOf(key) !== -1);
+    let u64 = sig === '8B64' || (reader.large && helpers_1.largeAdditionalInfoKeys.indexOf(key) !== -1);
+    // these keys were written by older versions of this library with 32bit length and 8BIM signature,
+    // 64bit length always has high 32bits set to 0 (lengths over 4GB are not supported)
+    if (reader.large && sig === '8BIM' && helpers_1.largeAdditionalInfoKeysObserved.indexOf(key) !== -1) {
+        // 32bit length of 0 is followed by signature of the next block, 64bit length would continue with its low 32bits
+        const next = reader.offset + 8 <= reader.view.byteLength ? reader.view.getUint32(reader.offset + 4) : 0;
+        const nextIsSignature = next === 0x3842494d /* 8BIM */ || next === 0x38423634 /* 8B64 */;
+        u64 = reader.view.getUint32(reader.offset) === 0 && !nextIsSignature;
+    }
     readSection(reader, 2, left => {
         const handler = additionalInfo_1.infoHandlersMap[key];
         if (handler) {
@@ -875,7 +967,7 @@ function readAdditionalLayerInfo(reader, target, psd, imageResources) {
             }
         }
         else {
-            reader.logMissingFeatures && reader.log(`Unhandled additional info: ${key}`);
+            reader.logMissingFeatures && key !== 'GenI' && key !== 'OCIO' && key !== 'CAI ' && reader.log(`Unhandled additional info: ${key}`);
             skipBytes(reader, left());
         }
         if (left()) {
@@ -907,7 +999,7 @@ function createImageDataBitDepth(width, height, bitDepth, channels, memoryLimit)
     }
 }
 function readImageData(reader, psd) {
-    var _a;
+    var _a, _b, _c;
     const compression = readUint16(reader);
     const bitsPerChannel = (_a = psd.bitsPerChannel) !== null && _a !== void 0 ? _a : 8;
     const { width, height } = psd;
@@ -939,11 +1031,7 @@ function readImageData(reader, psd) {
         case 1 /* ColorMode.Grayscale */: {
             const colorChannels = psd.colorMode === 1 /* ColorMode.Grayscale */ ? 1 : 3;
             const offsets = compositeChannelOffsets(reader, psd, colorChannels, 3);
-            const start = reader.offset;
             readCompositeChannels(reader, compression, imageData, bitsPerChannel, 4, offsets);
-            if (helpers_1.RAW_IMAGE_DATA && compression === 1 /* Compression.RleCompressed */) {
-                psd.imageDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start, reader.offset - start);
-            }
             if (psd.colorMode === 1 /* ColorMode.Grayscale */) {
                 setupGrayscale(imageData);
             }
@@ -957,41 +1045,42 @@ function readImageData(reader, psd) {
             const offsets = compositeChannelOffsets(reader, psd, 1, -1);
             const indexedImageData = { width, height, data: new Uint8Array(width * height) };
             readCompositeChannels(reader, compression, indexedImageData, 8, 1, offsets);
-            indexedToRgb(indexedImageData, imageData, psd.palette);
+            indexedToRgb(indexedImageData, imageData, psd.palette, (_c = (_b = psd.imageResources) === null || _b === void 0 ? void 0 : _b.transparencyIndex) !== null && _c !== void 0 ? _c : -1);
             break;
         }
         case 4 /* ColorMode.CMYK */: {
-            if (bitsPerChannel !== 8)
+            if (bitsPerChannel !== 8 && bitsPerChannel !== 16)
                 throw new Error('bitsPerChannel not supported');
             const offsets = compositeChannelOffsets(reader, psd, 4, 4);
-            const cmykImageData = { width, height, data: new Uint8Array(width * height * 5) };
-            const start = reader.offset;
-            readCompositeChannels(reader, compression, cmykImageData, 8, 5, offsets);
-            cmykToRgb(cmykImageData, imageData, true);
-            if (helpers_1.RAW_IMAGE_DATA && compression === 1 /* Compression.RleCompressed */) {
-                psd.imageDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start, reader.offset - start);
-            }
+            const cmykImageData = createImageDataBitDepth(width, height, bitsPerChannel, 5, reader.totalMemoryLimit);
+            resetAlpha(cmykImageData, true);
+            readCompositeChannels(reader, compression, cmykImageData, bitsPerChannel, 5, offsets);
+            cmykToRgb(cmykImageData, imageData, !!reader.globalAlpha);
             break;
         }
         default: throw new Error(`Color mode not supported: ${psd.colorMode}`);
     }
-    // remove weird white matte
-    if (reader.globalAlpha) {
+    // remove weird white matte (already removed when converting from CMYK)
+    if (reader.globalAlpha && psd.colorMode !== 4 /* ColorMode.CMYK */) {
         removeWhiteMatte(imageData);
     }
     return imageData;
 }
 // returns target offset for each of the composite image channels stored in the file, -1 for channels that are skipped
 function compositeChannelOffsets(reader, psd, colorChannels, alphaOffset) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c;
     const channelCount = (_a = psd.channels) !== null && _a !== void 0 ? _a : (colorChannels + (reader.globalAlpha ? 1 : 0));
     if (channelCount < colorChannels)
         throw new Error(`Invalid channel count: ${channelCount}`);
     // First extra channel is transparency if document has global alpha (negative layer count). Some non-Photoshop
     // applications write transparency channel without setting global alpha, in that case extra channel is not
     // listed in alpha channel names (Photoshop names all user alpha channels / saved selections).
-    const namedChannels = (_d = (_c = (_b = psd.imageResources) === null || _b === void 0 ? void 0 : _b.alphaChannelNames) === null || _c === void 0 ? void 0 : _c.length) !== null && _d !== void 0 ? _d : 0;
-    const hasTransparency = reader.globalAlpha || (channelCount - colorChannels) > namedChannels;
+    // Photoshop also lists merged transparency as first alpha channel named "Transparency" (in documents marked with
+    // Mtrn/Mt16/Mt32 additional info, or in some 16bit documents with layers stored in Lr16 without any other mark)
+    const alphaNames = (_c = (_b = psd.imageResources) === null || _b === void 0 ? void 0 : _b.alphaChannelNames) !== null && _c !== void 0 ? _c : [];
+    const namedChannels = alphaNames.length;
+    const namedTransparency = !!reader.layersInGlobalInfo && alphaNames[0] === 'Transparency' && namedChannels === channelCount - colorChannels;
+    const hasTransparency = reader.globalAlpha || namedTransparency || (channelCount - colorChannels) > namedChannels;
     const offsets = [];
     for (let i = 0; i < channelCount; i++) {
         if (i < colorChannels) {
@@ -1070,41 +1159,54 @@ function removeWhiteMatte({ data, width, height }) {
         }
     }
 }
-function cmykToRgb(cmyk, rgb, reverseAlpha) {
+// converts value in 0-255 range to target range, rounding and clamping it
+function toRange(value, max) {
+    value = Math.round(value * (max / 255));
+    return value <= 0 ? 0 : (value >= max ? max : value);
+}
+// converts CMYK data to RGB using approximation of U.S. Web Coated (SWOP) v2 profile (see cmykToRgbValues)
+// cmyk - 8 or 16 bit data with 5 channels (cmyka), rgb - 8 or 16 bit data with 4 channels (rgba)
+// removeMatte - colors are blended with white (no ink), used for composite image of documents with global alpha
+function cmykToRgb(cmyk, rgb, removeMatte) {
     const size = rgb.width * rgb.height * 4;
     const srcData = cmyk.data;
     const dstData = rgb.data;
+    const srcMax = srcData instanceof Uint16Array ? 0xffff : 0xff;
+    const dstMax = dstData instanceof Uint16Array ? 0xffff : 0xff;
+    const out = [0, 0, 0];
     for (let src = 0, dst = 0; dst < size; src += 5, dst += 4) {
-        const c = srcData[src];
-        const m = srcData[src + 1];
-        const y = srcData[src + 2];
-        const k = srcData[src + 3];
-        dstData[dst] = ((((c * k) | 0) / 255) | 0);
-        dstData[dst + 1] = ((((m * k) | 0) / 255) | 0);
-        dstData[dst + 2] = ((((y * k) | 0) / 255) | 0);
-        dstData[dst + 3] = reverseAlpha ? 255 - srcData[src + 4] : srcData[src + 4];
-    }
-    // for (let src = 0, dst = 0; dst < size; src += 5, dst += 4) {
-    // 	const c = 1 - (srcData[src + 0] / 255);
-    // 	const m = 1 - (srcData[src + 1] / 255);
-    // 	const y = 1 - (srcData[src + 2] / 255);
-    // 	// const k = srcData[src + 3] / 255;
-    // 	dstData[dst + 0] = ((1 - c * 0.8) * 255) | 0;
-    // 	dstData[dst + 1] = ((1 - m * 0.8) * 255) | 0;
-    // 	dstData[dst + 2] = ((1 - y * 0.8) * 255) | 0;
-    // 	dstData[dst + 3] = reverseAlpha ? 255 - srcData[src + 4] : srcData[src + 4];
-    // }
-}
-function indexedToRgb(indexed, rgb, palette) {
+        const a = srcData[src + 4];
+        // image data stores inverted values (0 = 100% ink)
+        let c = 1 - srcData[src] / srcMax;
+        let m = 1 - srcData[src + 1] / srcMax;
+        let y = 1 - srcData[src + 2] / srcMax;
+        let k = 1 - srcData[src + 3] / srcMax;
+        if (removeMatte && a > 0 && a < srcMax) {
+            const ra = srcMax / a;
+            c = Math.min(1, c * ra);
+            m = Math.min(1, m * ra);
+            y = Math.min(1, y * ra);
+            k = Math.min(1, k * ra);
+        }
+        (0, helpers_1.cmykToRgbValues)(c, m, y, k, out);
+        dstData[dst] = toRange(out[0], dstMax);
+        dstData[dst + 1] = toRange(out[1], dstMax);
+        dstData[dst + 2] = toRange(out[2], dstMax);
+        dstData[dst + 3] = srcMax === dstMax ? a : Math.round(a * dstMax / srcMax);
+    }
+}
+// transparencyIndex - palette index of transparent color (-1 if there's none)
+function indexedToRgb(indexed, rgb, palette, transparencyIndex) {
     const size = indexed.width * indexed.height;
     const srcData = indexed.data;
     const dstData = rgb.data;
     for (let src = 0, dst = 0; src < size; src++, dst += 4) {
-        const c = palette[srcData[src]];
+        const index = srcData[src];
+        const c = palette[index];
         dstData[dst + 0] = c.r;
         dstData[dst + 1] = c.g;
         dstData[dst + 2] = c.b;
-        dstData[dst + 3] = 255;
+        dstData[dst + 3] = index === transparencyIndex ? 0 : 255;
     }
 }
 // number of bytes used to store single channel value, 1-bit data is handled as bytes
@@ -1256,8 +1358,8 @@ function readDataZip(compressed, pixelData, width, height, bitDepth, step, offse
             recoverMemory(reader, expectedSize);
     }
 }
-// decodes single PackBits row, returns number of decoded values
-function decodeRLERow(src, i, end, dst, p, step, count) {
+// decodes single PackBits row into byte buffer, returns number of decoded bytes
+function decodeRLERow(src, i, end, dst, count) {
     let x = 0;
     while (i < end && x < count) {
         const header = src[i++];
@@ -1268,10 +1370,8 @@ function decodeRLERow(src, i, end, dst, p, step, count) {
             let n = 257 - header;
             if (n > count - x)
                 n = count - x;
+            dst.fill(value, x, x + n);
             x += n;
-            for (; n > 0; n--, p += step) {
-                dst[p] = value;
-            }
         }
         else if (header < 128) {
             let n = header + 1;
@@ -1279,9 +1379,8 @@ function decodeRLERow(src, i, end, dst, p, step, count) {
                 n = count - x;
             if (n > end - i)
                 n = end - i;
-            x += n;
-            for (; n > 0; n--, p += step) {
-                dst[p] = src[i++];
+            for (; n > 0; n--) {
+                dst[x++] = src[i++];
             }
         }
         else {
@@ -1290,6 +1389,47 @@ function decodeRLERow(src, i, end, dst, p, step, count) {
     }
     return x;
 }
+// decodes RLE rows of single 8bit channel, writing values to `data` with `step`
+// (kept as single function with the loops, inlining row decoder into readDataRLE makes V8 generate much slower code)
+function decodeRLEChannel8(src, lengths, li, pos, width, height, data, offset, step) {
+    const srcEnd = src.length | 0;
+    for (let y = 0; y < height; y++, li++) {
+        let i = (pos < srcEnd ? pos : srcEnd) | 0;
+        pos += lengths[li];
+        const end = (pos < srcEnd ? pos : srcEnd) | 0;
+        let p = (offset + y * width * step) | 0;
+        let x = 0;
+        while (i < end && x < width) {
+            const header = src[i++] | 0;
+            if (header > 128) {
+                if (i >= end)
+                    break;
+                const value = src[i++] | 0;
+                let n = (257 - header) | 0;
+                if (n > width - x)
+                    n = (width - x) | 0;
+                x = (x + n) | 0;
+                for (const pe = (p + n * step) | 0; p < pe; p = (p + step) | 0) {
+                    data[p] = value;
+                }
+            }
+            else if (header < 128) {
+                let n = (header + 1) | 0;
+                if (n > width - x)
+                    n = (width - x) | 0;
+                if (n > end - i)
+                    n = (end - i) | 0;
+                x = (x + n) | 0;
+                for (const ie = (i + n) | 0; i < ie; i = (i + 1) | 0, p = (p + step) | 0) {
+                    data[p] = src[i];
+                }
+            }
+            else {
+                // ignore 128
+            }
+        }
+    }
+}
 // converts big-endian 16/32-bit values from bytes and writes them to `data` starting at `p` with `step`
 function scatterValues(bytes, count, bpv, data, p, step) {
     if (bpv === 2) {
@@ -1304,8 +1444,8 @@ function scatterValues(bytes, count, bpv, data, p, step) {
         }
     }
 }
-// decodes RLE rows of single channel, each row starts at the beginning of the image row
-function decodeRLEChannel(src, lengths, li, pos, width, height, data, offset, step, bpv, row) {
+// decodes RLE rows of single 16bit or 32bit channel, each row is decoded into `row` buffer and then converted to values
+function decodeRLEChannelWide(src, lengths, li, pos, width, height, data, offset, step, bpv, row) {
     const srcEnd = src.length;
     const rowSize = width * bpv;
     for (let y = 0; y < height; y++, li++) {
@@ -1314,25 +1454,24 @@ function decodeRLEChannel(src, lengths, li, pos, width, height, data, offset, st
         const rowEnd = pos < srcEnd ? pos : srcEnd;
         if (rowStart >= rowEnd)
             continue;
-        if (bpv === 1) {
-            decodeRLERow(src, rowStart, rowEnd, data, offset + y * width * step, step, width);
-        }
-        else {
-            const decoded = decodeRLERow(src, rowStart, rowEnd, row, 0, 1, rowSize);
-            scatterValues(row, Math.floor(decoded / bpv), bpv, data, offset + y * width * step, step);
-        }
+        const decoded = decodeRLERow(src, rowStart, rowEnd, row, rowSize);
+        scatterValues(row, Math.floor(decoded / bpv), bpv, data, offset + y * width * step, step);
     }
 }
 function readDataRLE(reader, pixelData, width, height, bitDepth, step, offsets, large) {
     const data = pixelData && pixelData.data;
     const rows = offsets.length * height;
     const lengthSize = large ? 4 : 2;
-    consumeMemory(reader, rows * lengthSize);
+    const lengthsMemory = rows * lengthSize;
+    const srcEnd = reader.view.byteLength;
+    const bpv = bytesPerValue(bitDepth); // throws before consuming memory
+    let lengths;
+    consumeMemory(reader, lengthsMemory);
     try {
-        if ((reader.offset + rows * lengthSize) > reader.view.byteLength) {
+        if ((reader.offset + lengthsMemory) > srcEnd) {
             throw new Error('RLE row lengths exceed buffer length');
         }
-        const lengths = large ? new Uint32Array(rows) : new Uint16Array(rows);
+        lengths = large ? new Uint32Array(rows) : new Uint16Array(rows);
         let total = 0;
         if (large) {
             for (let i = 0; i < rows; i++)
@@ -1342,32 +1481,37 @@ function readDataRLE(reader, pixelData, width, height, bitDepth, step, offsets,
             for (let i = 0; i < rows; i++)
                 total += (lengths[i] = readUint16(reader));
         }
-        const start = reader.offset;
-        const srcEnd = reader.view.byteLength;
-        if (total > (srcEnd - start)) {
+        if (total > (srcEnd - reader.offset)) {
             // broken or truncated file, decode only data that is available
             warnOrThrow(reader, 'RLE data exceeds buffer length');
         }
-        const bpv = bytesPerValue(bitDepth);
         if (data)
             verifyArrayType(data, bpv);
-        const src = new Uint8Array(reader.view.buffer, reader.view.byteOffset, srcEnd);
-        const row = (data && bpv > 1) ? new Uint8Array(width * bpv) : undefined;
-        let pos = start;
-        for (let c = 0, li = 0; c < offsets.length; c++, li += height) {
-            const offset = offsets[c] | 0;
-            const channelStart = pos;
-            for (let y = 0; y < height; y++)
-                pos += lengths[li + y];
-            if (data && offset >= 0 && offset < step) {
-                decodeRLEChannel(src, lengths, li, channelStart, width, height, data, offset, step, bpv, row);
+    }
+    catch (e) {
+        recoverMemory(reader, lengthsMemory);
+        throw e;
+    }
+    // decoding can't throw, it's kept outside of try block because V8 generates much slower code for loops inlined into try block
+    const src = new Uint8Array(reader.view.buffer, reader.view.byteOffset, srcEnd);
+    const row = (data && bpv > 1) ? new Uint8Array(width * bpv) : undefined;
+    let pos = reader.offset;
+    for (let c = 0, li = 0; c < offsets.length; c++, li += height) {
+        const offset = offsets[c] | 0;
+        const channelStart = pos;
+        for (let y = 0; y < height; y++)
+            pos += lengths[li + y];
+        if (data && offset >= 0 && offset < step) {
+            if (bpv === 1) {
+                decodeRLEChannel8(src, lengths, li, channelStart, width, height, data, offset, step);
+            }
+            else {
+                decodeRLEChannelWide(src, lengths, li, channelStart, width, height, data, offset, step, bpv, row);
             }
         }
-        reader.offset = pos;
-    }
-    finally {
-        recoverMemory(reader, rows * lengthSize);
     }
+    reader.offset = pos;
+    recoverMemory(reader, lengthsMemory);
 }
 function readSection(reader, round, func, skipEmpty = true, eightBytes = false) {
     let length = readUint32(reader);
@@ -1415,11 +1559,11 @@ function readColor(reader) {
             skipBytes(reader, 2);
             return { h, s, b };
         }
-        case 2 /* ColorSpace.CMYK */: {
-            const c = readUint16(reader) / 257;
-            const m = readUint16(reader) / 257;
-            const y = readUint16(reader) / 257;
-            const k = readUint16(reader) / 257;
+        case 2 /* ColorSpace.CMYK */: { // 0 = 100% ink
+            const c = (0xffff - readUint16(reader)) / 257;
+            const m = (0xffff - readUint16(reader)) / 257;
+            const y = (0xffff - readUint16(reader)) / 257;
+            const k = (0xffff - readUint16(reader)) / 257;
             return { c, m, y, k };
         }
         case 7 /* ColorSpace.Lab */: {
@@ -1440,6 +1584,24 @@ function readColor(reader) {
             throw new Error('Invalid color space');
     }
 }
+const MAX_PATTERN_SIZE = 30000;
+// reads pattern, unsupported or invalid patterns are skipped (returns undefined) unless throwForMissingFeatures is set
+function readPatternSafe(reader) {
+    let length = reader.view.getUint32(reader.offset);
+    while (length % 4)
+        length++;
+    const end = reader.offset + 4 + length;
+    try {
+        return readPattern(reader);
+    }
+    catch (e) {
+        if (reader.throwForMissingFeatures)
+            throw e;
+        reader.logMissingFeatures && reader.log(`Skipped pattern: ${e.message}`);
+        reader.offset = end;
+        return undefined;
+    }
+}
 function readPattern(reader) {
     let length = readUint32(reader);
     while (length % 4)
@@ -1451,8 +1613,8 @@ function readPattern(reader) {
     const colorMode = readUint32(reader);
     const x = readInt16(reader);
     const y = readInt16(reader);
-    // we only support RGB and grayscale for now
-    if (colorMode !== 3 /* ColorMode.RGB */ && colorMode !== 1 /* ColorMode.Grayscale */ && colorMode !== 2 /* ColorMode.Indexed */) {
+    // we only support RGB, grayscale, indexed and CMYK for now
+    if (colorMode !== 3 /* ColorMode.RGB */ && colorMode !== 1 /* ColorMode.Grayscale */ && colorMode !== 2 /* ColorMode.Indexed */ && colorMode !== 4 /* ColorMode.CMYK */) {
         throw new Error(`Unsupported pattern color mode: ${colorMode}`);
     }
     let name = readUnicodeString(reader);
@@ -1466,7 +1628,9 @@ function readPattern(reader) {
                 b: readUint8(reader),
             });
         }
-        skipBytes(reader, 4); // no idea what this is
+        // some writers follow the palette with 4 extra bytes (unknown)
+        if (reader.view.getUint32(reader.offset) !== 3)
+            skipBytes(reader, 4);
     }
     // virtual memory array list
     const version2 = readUint32(reader);
@@ -1480,17 +1644,31 @@ function readPattern(reader) {
     const channelsCount = readUint32(reader);
     const width = right - left;
     const height = bottom - top;
-    const size = width * height * 4;
-    consumeMemory(reader, size);
-    const data = new Uint8Array(size);
-    for (let i = 3; i < data.byteLength; i += 4) {
-        data[i] = 255;
-    }
-    for (let i = 0, ch = 0; i < (channelsCount + 2); i++) {
+    if (width < 0 || height < 0)
+        throw new Error('Invalid pattern bounds');
+    if (width > MAX_PATTERN_SIZE || height > MAX_PATTERN_SIZE)
+        throw new Error(`Pattern too large (${width}x${height})`);
+    if (channelsCount > 64)
+        throw new Error(`Invalid pattern channel count: ${channelsCount}`);
+    // channels cover whole pattern, each 2 bytes of RLE data can produce at most 128 bytes
+    if (width * height > (Math.min(end, reader.view.byteLength) - reader.offset) * 64)
+        throw new Error('Pattern data out of bounds');
+    // first written arrays are color channels, next one is transparency (Photoshop stores it in the last, sheet mask, array)
+    const colorChannels = colorMode === 3 /* ColorMode.RGB */ ? 3 : (colorMode === 4 /* ColorMode.CMYK */ ? 4 : 1);
+    const isCmyk = colorMode === 4 /* ColorMode.CMYK */;
+    const alphaTarget = isCmyk ? 4 : 3;
+    const channels = [];
+    let maxDecodeSize = 0;
+    // validate all channels before allocating any image data
+    for (let i = 0, ch = 0; i < (channelsCount + 2) && reader.offset + 4 <= end; i++) {
         const has = readUint32(reader);
         if (!has)
             continue;
         const length = readUint32(reader);
+        if (!length)
+            continue;
+        if (length < 23)
+            throw new Error('Invalid pattern channel length');
         const pixelDepth = readUint32(reader);
         const ctop = readUint32(reader);
         const cleft = readUint32(reader);
@@ -1498,97 +1676,127 @@ function readPattern(reader) {
         const cright = readUint32(reader);
         const pixelDepth2 = readUint16(reader);
         const compressionMode = readUint8(reader); // 0 - raw, 1 - rle
-        const dataLength = length - (4 + 16 + 2 + 1);
-        const cdata = readBytes(reader, dataLength);
-        if (pixelDepth !== 8 || pixelDepth2 !== 8) {
-            throw new Error('16bit pixel depth not supported for patterns');
-        }
+        const cdata = readBytes(reader, length - 23);
+        const depth = (pixelDepth2 === 8 || pixelDepth2 === 16 || pixelDepth2 === 32) ? pixelDepth2 : pixelDepth;
+        if (depth !== 8 && depth !== 16 && depth !== 32)
+            throw new Error(`Unsupported pattern pixel depth: ${depth}`);
+        if (ctop < top || cleft < left || cbottom > bottom || cright > right || cbottom < ctop || cright < cleft) {
+            throw new Error('Pattern channel bounds outside of pattern bounds');
+        }
+        const target = ch < colorChannels ? ch : (ch === colorChannels ? alphaTarget : -1);
+        ch++;
+        if (target === -1)
+            continue;
         const w = cright - cleft;
         const h = cbottom - ctop;
-        const ox = cleft - left;
-        const oy = ctop - top;
+        const rowBytes = w * (depth / 8);
+        const channelSize = rowBytes * h;
         if (compressionMode === 0) {
-            if (colorMode === 3 /* ColorMode.RGB */ && ch < 3) {
-                for (let y = 0; y < h; y++) {
-                    for (let x = 0; x < w; x++) {
-                        const src = x + y * w;
-                        const dst = (ox + x + (y + oy) * width) * 4;
-                        data[dst + ch] = cdata[src];
-                    }
-                }
-            }
-            else if (colorMode === 1 /* ColorMode.Grayscale */ && ch < 1) {
-                for (let y = 0; y < h; y++) {
-                    for (let x = 0; x < w; x++) {
-                        const src = x + y * w;
-                        const dst = (ox + x + (y + oy) * width) * 4;
-                        const value = cdata[src];
-                        data[dst + 0] = value;
-                        data[dst + 1] = value;
-                        data[dst + 2] = value;
-                    }
-                }
-            }
-            else if (colorMode === 2 /* ColorMode.Indexed */) {
-                for (let y = 0; y < h; y++) {
-                    for (let x = 0; x < w; x++) {
-                        const src = x + y * w;
-                        const dst = (ox + x + (y + oy) * width) * 4;
-                        const index = cdata[src];
-                        const color = palette[index];
-                        data[dst + 0] = color.r;
-                        data[dst + 1] = color.g;
-                        data[dst + 2] = color.b;
-                    }
-                }
-            }
-            else {
-                if (reader.throwForMissingFeatures)
-                    throw new Error('Invalid color pattern');
-            }
+            if (cdata.byteLength < channelSize)
+                throw new Error('Pattern channel data out of bounds');
         }
         else if (compressionMode === 1) {
-            consumeMemory(reader, w * h);
-            const pixelData = { data, width, height };
-            const tempData = { data: new Uint8Array(w * h), width: w, height: h };
+            // each 2 bytes of RLE data can produce at most 128 bytes
+            if (channelSize > cdata.byteLength * 64)
+                throw new Error('Pattern channel data out of bounds');
+            maxDecodeSize = Math.max(maxDecodeSize, channelSize);
+        }
+        else {
+            throw new Error('Invalid pattern compression mode');
+        }
+        channels.push({ target, depth, compressionMode, cdata, ctop, cleft, w, h, rowBytes, channelSize });
+    }
+    // check peak memory up front (image data, CMYK buffer and largest RLE decode buffer),
+    // image data is consumed only after successful decoding so failed patterns don't reduce the limit
+    const size = width * height * 4;
+    const cmykSize = isCmyk ? width * height * 5 : 0;
+    consumeMemory(reader, size + cmykSize + maxDecodeSize);
+    recoverMemory(reader, size + cmykSize + maxDecodeSize);
+    const data = new Uint8Array(size);
+    for (let i = 3; i < data.byteLength; i += 4) {
+        data[i] = 255;
+    }
+    // CMYK channels are decoded into separate buffer (5 values per pixel, inverted, 0 = 100% ink) and converted to RGB at the end
+    const cmyk = isCmyk ? new Uint8Array(cmykSize).fill(255) : undefined;
+    for (const { target, depth, compressionMode, cdata, ctop, cleft, w, h, rowBytes, channelSize } of channels) {
+        let bytes = cdata;
+        if (compressionMode === 1) {
+            bytes = new Uint8Array(channelSize);
             const cdataReader = createReader(cdata.buffer, cdata.byteOffset, cdata.byteLength);
-            if (colorMode === 3 /* ColorMode.RGB */ && ch < 3) {
-                readDataRLE(cdataReader, tempData, w, h, 8, 1, [0], false);
-                copyChannelToRGBA(tempData, pixelData, ox, oy, ch);
-            }
-            if (colorMode === 1 /* ColorMode.Grayscale */ && ch < 1) {
-                readDataRLE(cdataReader, tempData, w, h, 8, 1, [0], false);
-                copyChannelToRGBA(tempData, pixelData, ox, oy, 0);
-                setupGrayscale(pixelData);
+            readDataRLE(cdataReader, { data: bytes, width: rowBytes, height: h }, rowBytes, h, 8, 1, [0], false);
+        }
+        if (depth !== 8)
+            bytes = patternChannelTo8bit(bytes, w * h, depth);
+        const ox = cleft - left;
+        const oy = ctop - top;
+        if (cmyk) {
+            copyPatternChannel(bytes, cmyk, w, h, (ox + oy * width) * 5 + target, width * 5, 5);
+        }
+        else if (target === 3 || colorMode === 3 /* ColorMode.RGB */) {
+            copyPatternChannel(bytes, data, w, h, (ox + oy * width) * 4 + target, width * 4, 4);
+        }
+        else if (colorMode === 2 /* ColorMode.Indexed */) {
+            const colors = new Uint8Array(256 * 3);
+            for (let i = 0; i < 256; i++) {
+                colors[i * 3 + 0] = palette[i].r;
+                colors[i * 3 + 1] = palette[i].g;
+                colors[i * 3 + 2] = palette[i].b;
             }
-            if (colorMode === 2 /* ColorMode.Indexed */) {
-                // TODO:
-                throw new Error('Indexed pattern color mode not implemented');
+            for (let y = 0; y < h; y++) {
+                for (let x = 0, src = y * w, dst = (ox + (y + oy) * width) * 4; x < w; x++, src++, dst += 4) {
+                    const index = bytes[src] * 3;
+                    data[dst + 0] = colors[index + 0];
+                    data[dst + 1] = colors[index + 1];
+                    data[dst + 2] = colors[index + 2];
+                }
             }
-            recoverMemory(reader, w * h);
         }
-        else {
-            throw new Error('Invalid pattern compression mode');
+        else { // grayscale
+            for (let y = 0; y < h; y++) {
+                for (let x = 0, src = y * w, dst = (ox + (y + oy) * width) * 4; x < w; x++, src++, dst += 4) {
+                    const value = bytes[src];
+                    data[dst + 0] = value;
+                    data[dst + 1] = value;
+                    data[dst + 2] = value;
+                }
+            }
         }
-        ch++;
     }
+    if (cmyk) {
+        cmykToRgb({ width, height, data: cmyk }, { width, height, data }, false);
+    }
+    consumeMemory(reader, size);
     reader.offset = end;
     return { id, name, x, y, bounds: { x: left, y: top, w: width, h: height }, data };
 }
-function copyChannelToRGBA(srcData, dstData, ox, oy, offset) {
-    const w = srcData.width;
-    const h = srcData.height;
-    const width = dstData.width;
-    for (let y = 0; y < h; y++) {
-        for (let x = 0; x < w; x++) {
-            const src = x + y * w;
-            const dst = (ox + x + (y + oy) * width) * 4;
-            const value = srcData.data[src];
-            dstData.data[dst + offset] = value;
+// converts big-endian 16bit or 32bit (float) values to 8bit values
+function patternChannelTo8bit(bytes, count, depth) {
+    const result = new Uint8Array(count);
+    if (depth === 16) {
+        for (let i = 0; i < count; i++) {
+            result[i] = Math.round(((bytes[i * 2] << 8) | bytes[i * 2 + 1]) / 257);
+        }
+    }
+    else {
+        const view = new DataView(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+        for (let i = 0; i < count; i++) {
+            const value = view.getFloat32(i * 4, false);
+            result[i] = value > 0 ? (value < 1 ? Math.round(value * 255) : 255) : 0;
+        }
+    }
+    return result;
+}
+// copies w x h channel values into interleaved data starting at `offset`
+function copyPatternChannel(bytes, data, w, h, offset, stride, step) {
+    for (let y = 0, src = 0; y < h; y++) {
+        for (let x = 0, dst = offset + y * stride; x < w; x++, src++, dst += step) {
+            data[dst] = bytes[src];
         }
     }
 }
 function consumeMemory(reader, size) {
+    if (!(size >= 0))
+        throw new Error('Invalid size');
     if (reader.totalMemoryLimit !== undefined) {
         if (reader.totalMemoryLimit < size)
             throw new Error('Exceeded memory limit');