ag-psd 32.0.0 → 33.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 };
@@ -247,7 +285,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 +296,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 +324,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 +347,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 +404,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 +417,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) {
@@ -442,9 +492,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 +525,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 => {
@@ -595,9 +657,9 @@ function readLayerChannelImageData(reader, psd, layer, channels) {
                 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)
@@ -631,6 +693,7 @@ function getCompositeImageData(psd) {
     if (info) {
         reader.large = info.large;
         reader.globalAlpha = info.globalAlpha;
+        reader.layersInGlobalInfo = !!info.layersInGlobalInfo;
     }
     return readImageData(reader, psd);
 }
@@ -711,18 +774,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 +806,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 +822,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 +834,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);
         }
     }
@@ -862,7 +908,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 +929,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 +961,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 +993,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 +1007,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 +1121,67 @@ 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);
+}
+// Polynomial approximation of U.S. Web Coated (SWOP) v2 CMYK to RGB conversion (default CMYK profile of Photoshop).
+// Coefficients are taken from pdf.js (DeviceCmykCS in src/core/colorspace.js, https://github.com/mozilla/pdf.js),
+// Copyright 2012 Mozilla Foundation, licensed under the Apache License, Version 2.0
+// (http://www.apache.org/licenses/LICENSE-2.0)
+// 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;
     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);
+        }
+        dstData[dst] = toRange(255 +
+            c * (-4.387332384609988 * c + 54.48615194189176 * m + 18.82290502165302 * y + 212.25662451639585 * k - 285.2331026137004) +
+            m * (1.7149763477362134 * m - 5.6096736904047315 * y - 17.873870861415444 * k - 5.497006427196366) +
+            y * (-2.5217340131683033 * y - 21.248923337353073 * k + 17.5119270841813) +
+            k * (-21.86122147463605 * k - 189.48180835922747), dstMax);
+        dstData[dst + 1] = toRange(255 +
+            c * (8.841041422036149 * c + 60.118027045597366 * m + 6.871425592049007 * y + 31.159100130055922 * k - 79.2970844816548) +
+            m * (-15.310361306967817 * m + 17.575251261109482 * y + 131.35250912493976 * k - 190.9453302588951) +
+            y * (4.444339102852739 * y + 9.8632861493405 * k - 24.86741582555878) +
+            k * (-20.737325471181034 * k - 187.80453709719578), dstMax);
+        dstData[dst + 2] = toRange(255 +
+            c * (0.8842522430003296 * c + 8.078677503112928 * m + 30.89978309703729 * y - 0.23883238689178934 * k - 14.183576799673286) +
+            m * (10.49593273432072 * m + 63.02378494754052 * y + 50.606957656360734 * k - 112.23884253719248) +
+            y * (0.03296041114873217 * y + 115.60384449646641 * k - 193.58209356861505) +
+            k * (-22.33816807309886 * k - 180.12613974708367), 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
@@ -1415,11 +1492,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 +1517,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 +1546,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 +1561,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 +1577,37 @@ function readPattern(reader) {
     const channelsCount = readUint32(reader);
     const width = right - left;
     const height = bottom - top;
+    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');
     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++) {
+    // 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);
+    // CMYK channels are decoded into separate buffer (5 values per pixel, inverted, 0 = 100% ink) and converted to RGB at the end
+    const cmyk = colorMode === 4 /* ColorMode.CMYK */ ? new Uint8Array(width * height * 5).fill(255) : undefined;
+    if (cmyk)
+        consumeMemory(reader, cmyk.byteLength);
+    const alphaTarget = cmyk ? 4 : 3;
+    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 +1615,92 @@ 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;
+        let bytes;
         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');
+            bytes = cdata;
         }
         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');
+            consumeMemory(reader, channelSize);
+            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);
-            }
-            if (colorMode === 2 /* ColorMode.Indexed */) {
-                // TODO:
-                throw new Error('Indexed pattern color mode not implemented');
-            }
-            recoverMemory(reader, w * h);
+            readDataRLE(cdataReader, { data: bytes, width: rowBytes, height: h }, rowBytes, h, 8, 1, [0], false);
         }
         else {
             throw new Error('Invalid pattern compression mode');
         }
-        ch++;
+        const ox = cleft - left;
+        const oy = ctop - top;
+        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 = depth === 8 ? bytes[src] : patternValueTo8bit(bytes, src, depth);
+                if (cmyk) {
+                    cmyk[(ox + x + (y + oy) * width) * 5 + target] = value;
+                }
+                else if (target === 3) {
+                    data[dst + 3] = value;
+                }
+                else if (colorMode === 2 /* ColorMode.Indexed */) {
+                    const color = palette[value];
+                    data[dst + 0] = color.r;
+                    data[dst + 1] = color.g;
+                    data[dst + 2] = color.b;
+                }
+                else if (colorMode === 1 /* ColorMode.Grayscale */) {
+                    data[dst + 0] = value;
+                    data[dst + 1] = value;
+                    data[dst + 2] = value;
+                }
+                else {
+                    data[dst + target] = value;
+                }
+            }
+        }
+        if (compressionMode === 1)
+            recoverMemory(reader, channelSize);
+    }
+    if (cmyk) {
+        cmykToRgb({ width, height, data: cmyk }, { width, height, data }, false);
+        recoverMemory(reader, cmyk.byteLength);
     }
     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) value at given index to 8bit value
+function patternValueTo8bit(bytes, index, depth) {
+    if (depth === 16) {
+        return Math.round(((bytes[index * 2] << 8) | bytes[index * 2 + 1]) / 257);
+    }
+    else {
+        const view = new DataView(bytes.buffer, bytes.byteOffset + index * 4, 4);
+        const value = view.getFloat32(0, false);
+        return value > 0 ? (value < 1 ? Math.round(value * 255) : 255) : 0;
     }
 }
 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');