ag-psd 16.0.0 → 17.0.1

package/src/psdReader.ts

@@ -67,6 +67,11 @@ export function readUint16(reader: PsdReader) {
 	return reader.view.getUint16(reader.offset - 2, false);
 }
 
+export function readUint16LE(reader: PsdReader) {
+	reader.offset += 2;
+	return reader.view.getUint16(reader.offset - 2, true);
+}
+
 export function readInt32(reader: PsdReader) {
 	reader.offset += 4;
 	return reader.view.getInt32(reader.offset - 4, false);
@@ -153,6 +158,20 @@ export function readUnicodeStringWithLength(reader: PsdReader, length: number) {
 	return text;
 }
 
+export function readUnicodeStringWithLengthLE(reader: PsdReader, length: number) {
+	let text = '';
+
+	while (length--) {
+		const value = readUint16LE(reader);
+
+		if (value || length > 0) { // remove trailing \0
+			text += String.fromCharCode(value);
+		}
+	}
+
+	return text;
+}
+
 export function readAsciiString(reader: PsdReader, length: number) {
 	let text = '';
 
@@ -379,15 +398,15 @@ function readLayerRecord(reader: PsdReader, psd: Psd, options: ReadOptionsExt) {
 	const channels: ChannelInfo[] = [];
 
 	for (let i = 0; i < channelCount; i++) {
-		let channelID = readInt16(reader) as ChannelID;
-		let channelLength = readUint32(reader);
+		let id = readInt16(reader) as ChannelID;
+		let length = readUint32(reader);
 
 		if (options.large) {
-			if (channelLength !== 0) throw new Error('Sizes larger than 4GB are not supported');
-			channelLength = readUint32(reader);
+			if (length !== 0) throw new Error('Sizes larger than 4GB are not supported');
+			length = readUint32(reader);
 		}
 
-		channels.push({ id: channelID, length: channelLength });
+		channels.push({ id, length });
 	}
 
 	checkSignature(reader, '8BIM');
@@ -401,11 +420,11 @@ function readLayerRecord(reader: PsdReader, psd: Psd, options: ReadOptionsExt) {
 	const flags = readUint8(reader);
 	layer.transparencyProtected = (flags & 0x01) !== 0;
 	layer.hidden = (flags & 0x02) !== 0;
+	if (flags & 0x20) layer.effectsOpen = true;
 	// 0x04 - obsolete
 	// 0x08 - 1 for Photoshop 5.0 and later, tells if bit 4 has useful information
 	// 0x10 - pixel data irrelevant to appearance of document
-	// 0x20 - ???
-	// if (flags & 0x20) (layer as any)._2 = true; // TEMP !!!!
+	// 0x20 - effects/filters panel is expanded
 
 	skipBytes(reader, 1);
 

package/src/psdWriter.ts

@@ -4,7 +4,7 @@ import {
 	offsetForChannel, createImageData, fromBlendMode, ChannelID, Compression, clamp,
 	LayerMaskFlags, MaskParams, ColorSpace, Bounds, largeAdditionalInfoKeys, RAW_IMAGE_DATA, writeDataZipWithoutPrediction
 } from './helpers';
-import { ExtendedWriteOptions, hasMultiEffects, infoHandlers } from './additionalInfo';
+import { ExtendedWriteOptions, infoHandlers } from './additionalInfo';
 import { resourceHandlers } from './imageResources';
 
 export interface PsdWriter {
@@ -43,11 +43,21 @@ export function writeUint16(writer: PsdWriter, value: number) {
 	writer.view.setUint16(offset, value, false);
 }
 
+export function writeUint16LE(writer: PsdWriter, value: number) {
+	const offset = addSize(writer, 2);
+	writer.view.setUint16(offset, value, true);
+}
+
 export function writeInt32(writer: PsdWriter, value: number) {
 	const offset = addSize(writer, 4);
 	writer.view.setInt32(offset, value, false);
 }
 
+export function writeInt32LE(writer: PsdWriter, value: number) {
+	const offset = addSize(writer, 4);
+	writer.view.setInt32(offset, value, true);
+}
+
 export function writeUint32(writer: PsdWriter, value: number) {
 	const offset = addSize(writer, 4);
 	writer.view.setUint32(offset, value, false);
@@ -102,6 +112,7 @@ export function writePascalString(writer: PsdWriter, text: string, padTo: number
 
 	for (let i = 0; i < length; i++) {
 		const code = text.charCodeAt(i);
+		// writeUint8(writer, code); // for testing
 		writeUint8(writer, code < 128 ? code : '?'.charCodeAt(0));
 	}
 
@@ -110,14 +121,23 @@ export function writePascalString(writer: PsdWriter, text: string, padTo: number
 	}
 }
 
-export function writeUnicodeString(writer: PsdWriter, text: string) {
-	writeUint32(writer, text.length);
-
+export function writeUnicodeStringWithoutLength(writer: PsdWriter, text: string) {
 	for (let i = 0; i < text.length; i++) {
 		writeUint16(writer, text.charCodeAt(i));
 	}
 }
 
+export function writeUnicodeStringWithoutLengthLE(writer: PsdWriter, text: string) {
+	for (let i = 0; i < text.length; i++) {
+		writeUint16LE(writer, text.charCodeAt(i));
+	}
+}
+
+export function writeUnicodeString(writer: PsdWriter, text: string) {
+	writeUint32(writer, text.length);
+	writeUnicodeStringWithoutLength(writer, text);
+}
+
 export function writeUnicodeStringWithPadding(writer: PsdWriter, text: string) {
 	writeUint32(writer, text.length + 1);
 
@@ -304,10 +324,7 @@ function writeLayerInfo(tempBuffer: Uint8Array, writer: PsdWriter, psd: Psd, glo
 			if (layer.vectorMask || (layer.sectionDivider && layer.sectionDivider.type !== SectionDividerType.Other)) {
 				flags |= 0x10; // pixel data irrelevant to appearance of document
 			}
-			if (layer.effects && hasMultiEffects(layer.effects)) { // TODO: this is not correct
-				flags |= 0x20; // just guessing this one, might be completely incorrect
-			}
-			// if ('_2' in layer) flags |= 0x20; // TEMP!!!
+			if (layer.effectsOpen) flags |= 0x20;
 
 			writeUint8(writer, flags);
 			writeUint8(writer, 0); // filler