ag-psd 17.0.6 → 18.0.1

package/dist-es/psd.d.ts

@@ -444,6 +444,7 @@ export interface BezierPath {
     open: boolean;
     operation: BooleanOperation;
     knots: BezierKnot[];
+    fillRule: 'even-odd' | 'non-zero';
 }
 export interface ExtraGradientInfo {
     style?: GradientStyle;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ag-psd",
-  "version": "17.0.6",
+  "version": "18.0.1",
   "description": "Library for reading and writing PSD files",
   "main": "dist/index.js",
   "module": "dist-es/index.js",

package/src/additionalInfo.ts

@@ -266,10 +266,15 @@ export function readVectorMask(reader: PsdReader, vectorMask: LayerVectorMask, w
 			case 3: { // Open subpath length record
 				readUint16(reader); // count
 				const boolOp = readInt16(reader);
-				readUint16(reader); // always 1 ?
+				const flags = readUint16(reader); // bit 1 always 1 ?
 				skipBytes(reader, 18);
 				// TODO: 'combine' here might be wrong
-				path = { open: selector === 3, operation: boolOp === -1 ? 'combine' : booleanOperations[boolOp], knots: [] };
+				path = {
+					open: selector === 3,
+					operation: boolOp === -1 ? 'combine' : booleanOperations[boolOp],
+					knots: [],
+					fillRule: flags === 2 ? 'non-zero' : 'even-odd',
+				};
 				paths.push(path);
 				break;
 			}
@@ -359,7 +364,7 @@ addHandler(
 			writeUint16(writer, path.open ? 3 : 0);
 			writeUint16(writer, path.knots.length);
 			writeUint16(writer, Math.abs(booleanOperations.indexOf(path.operation))); // default to 1 if not found
-			writeUint16(writer, 1);
+			writeUint16(writer, path.fillRule === 'non-zero' ? 2 : 1);
 			writeZeros(writer, 18); // TODO: these are sometimes non-zero
 
 			const linkedKnot = path.open ? 4 : 1;

package/src/psd.ts

@@ -441,6 +441,7 @@ export interface BezierPath {
 	open: boolean;
 	operation: BooleanOperation;
 	knots: BezierKnot[];
+	fillRule: 'even-odd' | 'non-zero';
 }
 
 export interface ExtraGradientInfo {