ag-psd 32.0.0 → 33.0.0

package/src/psdReader.ts

@@ -1,7 +1,8 @@
 import { Inflate } from 'pako';
 import { Psd, Layer, ColorMode, SectionDividerType, LayerAdditionalInfo, ReadOptions, LayerMaskData, Color, PatternInfo, GlobalLayerMaskInfo, RGB, PixelData, PixelArray, ChannelID, Compression } from './psd';
-import { resetImageData, offsetForChannel, decodeBitmap, createImageData, toBlendMode, LayerMaskFlags, MaskParams, ColorSpace, RAW_IMAGE_DATA, largeAdditionalInfoKeys, imageDataToCanvas, normalizeLabAB } from './helpers';
+import { resetImageData, offsetForChannel, decodeBitmap, createImageData, toBlendMode, LayerMaskFlags, MaskParams, ColorSpace, largeAdditionalInfoKeys, largeAdditionalInfoKeysObserved, imageDataToCanvas, normalizeLabAB } from './helpers';
 import { infoHandlersMap } from './additionalInfo';
+import { decodeString } from './utf8';
 import { InternalImageResources, resourceHandlersMap } from './imageResources';
 
 interface ChannelInfo {
@@ -9,7 +10,7 @@ interface ChannelInfo {
 	length: number;
 }
 
-export const supportedColorModes = [ColorMode.Bitmap, ColorMode.Grayscale, ColorMode.RGB, ColorMode.Indexed];
+export const supportedColorModes = [ColorMode.Bitmap, ColorMode.Grayscale, ColorMode.RGB, ColorMode.Indexed, ColorMode.CMYK];
 const colorModes = ['bitmap', 'grayscale', 'indexed', 'RGB', 'CMYK', '', '', 'multichannel', 'duotone', 'lab'];
 
 function setupGrayscale(data: PixelData) {
@@ -27,7 +28,44 @@ export interface PsdReader extends ReadOptions {
 	view: DataView;
 	large: boolean;
 	globalAlpha: boolean;
+	layersInGlobalInfo?: boolean; // layers were read from Lr16/Lr32/Layr global additional info
 	log(...args: any[]): void;
+	// text decoders, created lazily (null if not supported)
+	utf8Decoder?: TextDecoder | null;
+	utf8StrictDecoder?: TextDecoder | null;
+	gbkDecoder?: TextDecoder | null;
+}
+
+function createTextDecoder(label: string, options?: TextDecoderOptions) {
+	try {
+		return typeof TextDecoder !== 'undefined' ? new TextDecoder(label, options) : null;
+	} catch {
+		return null; // encoding not supported
+	}
+}
+
+// non-fatal UTF-8 decoder, malformed byte sequences are replaced with U+FFFD
+export function getUtf8Decoder(reader: PsdReader) {
+	if (reader.utf8Decoder === undefined) reader.utf8Decoder = createTextDecoder('utf-8', { ignoreBOM: true });
+	return reader.utf8Decoder;
+}
+
+// UTF-8 decoder that throws on malformed byte sequences
+export function getUtf8StrictDecoder(reader: PsdReader) {
+	if (reader.utf8StrictDecoder === undefined) reader.utf8StrictDecoder = createTextDecoder('utf-8', { ignoreBOM: true, fatal: true });
+	return reader.utf8StrictDecoder;
+}
+
+// GBK decoder that throws on malformed byte sequences
+export function getGbkStrictDecoder(reader: PsdReader) {
+	if (reader.gbkDecoder === undefined) reader.gbkDecoder = createTextDecoder('gbk', { fatal: true });
+	return reader.gbkDecoder;
+}
+
+export function decodeUtf8(reader: PsdReader, buffer: Uint8Array) {
+	// native decoder is faster only for longer strings
+	const decoder = buffer.byteLength > 1000 ? getUtf8Decoder(reader) : null;
+	return decoder ? decoder.decode(buffer) : decodeString(buffer);
 }
 
 export function createReader(buffer: ArrayBufferLike, offset?: number, length?: number): PsdReader {
@@ -244,7 +282,8 @@ export function readPsd(reader: PsdReader, readOptions: 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) throw new Error(`Invalid channel count: ${channels}`);
+	// 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}`);
 	if (supportedColorModes.indexOf(colorMode) === -1) throw new Error(`Color mode not supported: ${colorModes[colorMode] ?? colorMode}`);
 
@@ -253,6 +292,7 @@ export function readPsd(reader: PsdReader, readOptions: 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
 	}
@@ -280,12 +320,16 @@ export function readPsd(reader: PsdReader, readOptions: ReadOptions = {}) {
 	// image resources
 
 	const imageResources: InternalImageResources = {};
+	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 = resourceHandlersMap[id];
@@ -293,20 +337,29 @@ export function readPsd(reader: PsdReader, readOptions: ReadOptions = {}) {
 
 				if (handler && !skip) {
 					try {
-						handler.read(reader, imageResources, left);
+						handler.read(reader, imageResources, left, { signature, id, name, width, height });
 					} catch (e) {
 						if (reader.throwForMissingFeatures) throw e;
 						skipBytes(reader, left());
 					}
 				} 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, ...rest } = imageResources;
+	// 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, ...rest } = imageResources;
 
 	if (Object.keys(rest).length) {
 		psd.imageResources = rest;
@@ -354,6 +407,7 @@ export function readPsd(reader: PsdReader, readOptions: 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);
 			if (reader.useImageData) {
@@ -364,10 +418,6 @@ export function readPsd(reader: PsdReader, readOptions: 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;
 }
 
@@ -452,8 +502,11 @@ function readLayerRecord(reader: PsdReader, psd: Psd, imageResources: InternalIm
 
 	checkSignature(reader, '8BIM');
 	const blendMode = readSignature(reader);
-	if (!toBlendMode[blendMode]) throw new Error(`Invalid blend mode: '${blendMode}'`);
-	layer.blendMode = toBlendMode[blendMode];
+	if (!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 = toBlendMode[blendMode] || 'normal';
 
 	layer.opacity = readUint8(reader) / 0xff;
 	layer.clipping = readUint8(reader) === 1;
@@ -487,11 +540,20 @@ function readLayerRecord(reader: PsdReader, psd: Psd, imageResources: InternalIm
 	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: PsdReader, offset: number) {
+	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: { top?: number; left?: number; bottom?: number; right?: number; }, reader: PsdReader) {
 	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: PsdReader, layer: Layer) {
@@ -622,9 +684,9 @@ function readLayerChannelImageData(reader: PsdReader, psd: Psd, layer: Layer, ch
 				compression = readUint16(reader) as Compression;
 			}
 
-			// 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) as Compression;
 			}
 
@@ -665,6 +727,7 @@ export function getCompositeImageData(psd: Psd) {
 	if (info) {
 		reader.large = info.large;
 		reader.globalAlpha = info.globalAlpha;
+		reader.layersInGlobalInfo = !!info.layersInGlobalInfo;
 	}
 
 	return readImageData(reader, psd);
@@ -760,18 +823,13 @@ function getDataFromLayer(layer: Layer, read: LayerDataType, throwForMissingFeat
 
 	if (layerWidth && layerHeight && read === LayerDataType.Layer) {
 		if (cmyk) {
-			if (bitsPerChannel !== 8) throw new Error('bitsPerChannel not supported');
-			imageData = { width: layerWidth, height: layerHeight, data: new Uint8ClampedArray(layerWidth * layerHeight * 5) } as any as ImageData;
+			if (bitsPerChannel !== 8 && bitsPerChannel !== 16) throw new Error('bitsPerChannel not supported');
+			imageData = createImageDataBitDepth(layerWidth, layerHeight, bitsPerChannel, 5, memoryLimit);
 		} else {
 			imageData = createImageDataBitDepth(layerWidth, layerHeight, bitsPerChannel, 4, memoryLimit);
 		}
 	}
 
-	if (RAW_IMAGE_DATA) { // TODO: use layer.rawData instead
-		(layer as any).imageDataRaw = [];
-		(layer as any).imageDataRawCompression = [];
-	}
-
 	for (const { id, compression, data } of channels) {
 		if (!data) continue;
 
@@ -794,15 +852,6 @@ function getDataFromLayer(layer: Layer, read: LayerDataType, throwForMissingFeat
 				maskData = createImageDataBitDepth(maskWidth, maskHeight, bitsPerChannel, 4, memoryLimit);
 				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 (RAW_IMAGE_DATA) { // TODO: use layer.rawData instead
-					if (id === ChannelID.UserMask) {
-						(layer as any).maskDataRawCompression = compression;
-						(layer as any).maskDataRaw = data;
-					} else {
-						(layer as any).realMaskDataRawCompression = compression;
-						(layer as any).realMaskDataRaw = data;
-					}
-				}
 				setupGrayscale(maskData);
 				resetAlpha(maskData, false);
 			}
@@ -821,12 +870,6 @@ function getDataFromLayer(layer: Layer, read: LayerDataType, throwForMissingFeat
 			}
 
 			readData(dataReader, data.byteLength, targetData, compression, layerWidth, layerHeight, bitsPerChannel, offset, large, cmyk ? 5 : 4);
-
-			if (RAW_IMAGE_DATA) { // TODO: use layer.rawData instead
-				(layer as any).imageDataRawCompression[id] = compression;
-				(layer as any).imageDataRaw[id] = data;
-			}
-
 		}
 
 		if (id === ChannelID.Transparency) {
@@ -840,7 +883,8 @@ function getDataFromLayer(layer: Layer, read: LayerDataType, throwForMissingFeat
 
 		if (cmyk) {
 			const cmykData = imageData;
-			imageData = 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);
 		}
 	}
@@ -918,7 +962,16 @@ export function readAdditionalLayerInfo(reader: PsdReader, target: LayerAddition
 	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 && largeAdditionalInfoKeys.indexOf(key) !== -1);
+	let u64 = sig === '8B64' || (reader.large && 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' && 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 = infoHandlersMap[key];
@@ -930,7 +983,7 @@ export function readAdditionalLayerInfo(reader: PsdReader, target: LayerAddition
 				if (reader.throwForMissingFeatures) throw e;
 			}
 		} 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());
 		}
 
@@ -996,14 +1049,8 @@ function readImageData(reader: PsdReader, psd: Psd) {
 		case ColorMode.Grayscale: {
 			const colorChannels = psd.colorMode === ColorMode.Grayscale ? 1 : 3;
 			const offsets = compositeChannelOffsets(reader, psd, colorChannels, 3);
-			const start = reader.offset;
-
 			readCompositeChannels(reader, compression, imageData, bitsPerChannel, 4, offsets);
 
-			if (RAW_IMAGE_DATA && compression === Compression.RleCompressed) {
-				(psd as any).imageDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start, reader.offset - start);
-			}
-
 			if (psd.colorMode === ColorMode.Grayscale) {
 				setupGrayscale(imageData);
 			}
@@ -1016,29 +1063,25 @@ function readImageData(reader: PsdReader, psd: Psd) {
 			const offsets = compositeChannelOffsets(reader, psd, 1, -1);
 			const indexedImageData: PixelData = { width, height, data: new Uint8Array(width * height) };
 			readCompositeChannels(reader, compression, indexedImageData, 8, 1, offsets);
-			indexedToRgb(indexedImageData, imageData, psd.palette);
+			indexedToRgb(indexedImageData, imageData, psd.palette, psd.imageResources?.transparencyIndex ?? -1);
 			break;
 		}
 		case ColorMode.CMYK: {
-			if (bitsPerChannel !== 8) throw new Error('bitsPerChannel not supported');
+			if (bitsPerChannel !== 8 && bitsPerChannel !== 16) throw new Error('bitsPerChannel not supported');
 
 			const offsets = compositeChannelOffsets(reader, psd, 4, 4);
-			const cmykImageData: PixelData = { width, height, data: new Uint8Array(width * height * 5) };
-			const start = reader.offset;
-
-			readCompositeChannels(reader, compression, cmykImageData, 8, 5, offsets);
-			cmykToRgb(cmykImageData, imageData, true);
+			const cmykImageData = createImageDataBitDepth(width, height, bitsPerChannel, 5, reader.totalMemoryLimit);
 
-			if (RAW_IMAGE_DATA && compression === Compression.RleCompressed) {
-				(psd as any).imageDataRaw = new Uint8Array(reader.view.buffer, reader.view.byteOffset + start, reader.offset - start);
-			}
+			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 !== ColorMode.CMYK) {
 		removeWhiteMatte(imageData);
 	}
 
@@ -1053,8 +1096,12 @@ function compositeChannelOffsets(reader: PsdReader, psd: Psd, colorChannels: num
 	// 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 = psd.imageResources?.alphaChannelNames?.length ?? 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 = psd.imageResources?.alphaChannelNames ?? [];
+	const namedChannels = alphaNames.length;
+	const namedTransparency = !!reader.layersInGlobalInfo && alphaNames[0] === 'Transparency' && namedChannels === channelCount - colorChannels;
+	const hasTransparency = reader.globalAlpha || namedTransparency || (channelCount - colorChannels) > namedChannels;
 	const offsets: number[] = [];
 
 	for (let i = 0; i < channelCount; i++) {
@@ -1138,45 +1185,74 @@ function removeWhiteMatte({ data, width, height }: PixelData) {
 	}
 }
 
-function cmykToRgb(cmyk: PixelData, rgb: PixelData, reverseAlpha: boolean) {
+// converts value in 0-255 range to target range, rounding and clamping it
+function toRange(value: number, max: number) {
+	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: PixelData, rgb: PixelData, removeMatte: boolean) {
 	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: PixelData, rgb: PixelData, palette: RGB[]) {
+		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: PixelData, rgb: PixelData, palette: RGB[], transparencyIndex: number) {
 	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;
 	}
 }
 
@@ -1520,11 +1596,11 @@ export function readColor(reader: PsdReader): Color {
 			skipBytes(reader, 2);
 			return { h, s, b };
 		}
-		case ColorSpace.CMYK: {
-			const c = readUint16(reader) / 257;
-			const m = readUint16(reader) / 257;
-			const y = readUint16(reader) / 257;
-			const k = readUint16(reader) / 257;
+		case 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 ColorSpace.Lab: {
@@ -1546,6 +1622,24 @@ export function readColor(reader: PsdReader): Color {
 	}
 }
 
+const MAX_PATTERN_SIZE = 30000;
+
+// reads pattern, unsupported or invalid patterns are skipped (returns undefined) unless throwForMissingFeatures is set
+export function readPatternSafe(reader: PsdReader): PatternInfo | undefined {
+	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 as Error).message}`);
+		reader.offset = end;
+		return undefined;
+	}
+}
+
 export function readPattern(reader: PsdReader): PatternInfo {
 	let length = readUint32(reader);
 	while (length % 4) length++;
@@ -1557,8 +1651,8 @@ export function readPattern(reader: PsdReader): PatternInfo {
 	const x = readInt16(reader);
 	const y = readInt16(reader);
 
-	// we only support RGB and grayscale for now
-	if (colorMode !== ColorMode.RGB && colorMode !== ColorMode.Grayscale && colorMode !== ColorMode.Indexed) {
+	// we only support RGB, grayscale, indexed and CMYK for now
+	if (colorMode !== ColorMode.RGB && colorMode !== ColorMode.Grayscale && colorMode !== ColorMode.Indexed && colorMode !== ColorMode.CMYK) {
 		throw new Error(`Unsupported pattern color mode: ${colorMode}`);
 	}
 
@@ -1575,7 +1669,8 @@ export function readPattern(reader: PsdReader): PatternInfo {
 			})
 		}
 
-		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
@@ -1590,6 +1685,11 @@ export function readPattern(reader: PsdReader): PatternInfo {
 	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);
@@ -1598,11 +1698,21 @@ export function readPattern(reader: PsdReader): PatternInfo {
 		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 === ColorMode.RGB ? 3 : (colorMode === 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 === 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);
@@ -1610,82 +1720,75 @@ export function readPattern(reader: PsdReader): PatternInfo {
 		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);
+		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 (pixelDepth !== 8 || pixelDepth2 !== 8) {
-			throw new Error('16bit pixel depth not supported for patterns');
+		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: Uint8Array;
 
 		if (compressionMode === 0) {
-			if (colorMode === 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 === 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 === 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);
+			// 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');
 
-			const pixelData: PixelData = { data, width, height };
-			const tempData: PixelData = { data: new Uint8Array(w * h), width: w, height: h };
+			consumeMemory(reader, channelSize);
+			bytes = new Uint8Array(channelSize);
 			const cdataReader = createReader(cdata.buffer, cdata.byteOffset, cdata.byteLength);
+			readDataRLE(cdataReader, { data: bytes, width: rowBytes, height: h }, rowBytes, h, 8, 1, [0], false);
+		} else {
+			throw new Error('Invalid pattern compression mode');
+		}
 
-			if (colorMode === ColorMode.RGB && ch < 3) {
-				readDataRLE(cdataReader, tempData, w, h, 8, 1, [0], false);
-				copyChannelToRGBA(tempData, pixelData, ox, oy, ch);
-			}
-
-			if (colorMode === ColorMode.Grayscale && ch < 1) {
-				readDataRLE(cdataReader, tempData, w, h, 8, 1, [0], false);
-				copyChannelToRGBA(tempData, pixelData, ox, oy, 0);
-				setupGrayscale(pixelData);
-			}
+		const ox = cleft - left;
+		const oy = ctop - top;
 
-			if (colorMode === ColorMode.Indexed) {
-				// TODO:
-				throw new Error('Indexed pattern color mode not implemented');
+		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 === ColorMode.Indexed) {
+					const color = palette[value];
+					data[dst + 0] = color.r;
+					data[dst + 1] = color.g;
+					data[dst + 2] = color.b;
+				} else if (colorMode === ColorMode.Grayscale) {
+					data[dst + 0] = value;
+					data[dst + 1] = value;
+					data[dst + 2] = value;
+				} else {
+					data[dst + target] = value;
+				}
 			}
-
-			recoverMemory(reader, w * h);
-		} else {
-			throw new Error('Invalid pattern compression mode');
 		}
 
-		ch++;
+		if (compressionMode === 1) recoverMemory(reader, channelSize);
+	}
+
+	if (cmyk) {
+		cmykToRgb({ width, height, data: cmyk }, { width, height, data }, false);
+		recoverMemory(reader, cmyk.byteLength);
 	}
 
 	reader.offset = end;
@@ -1693,22 +1796,20 @@ export function readPattern(reader: PsdReader): PatternInfo {
 	return { id, name, x, y, bounds: { x: left, y: top, w: width, h: height }, data };
 }
 
-function copyChannelToRGBA(srcData: PixelData, dstData: PixelData, ox: number, oy: number, offset: number) {
-	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: Uint8Array, index: number, depth: number) {
+	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: PsdReader, size: number) {
+export function consumeMemory(reader: PsdReader, size: number) {
+	if (!(size >= 0)) throw new Error('Invalid size');
+
 	if (reader.totalMemoryLimit !== undefined) {
 		if (reader.totalMemoryLimit < size) throw new Error('Exceeded memory limit');
 		reader.totalMemoryLimit -= size;