ag-psd 20.2.3 → 21.0.1

package/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## v21.0.0
+- Fixed parsing path `operation` field to handle empty value
+
 ## v20.2.1
 - Fixed invalid value of `globalAngle` when the value is negative
 

package/dist/additionalInfo.js

@@ -181,13 +181,13 @@ function readVectorMask(reader, vectorMask, width, height, size) {
                 var boolOp = (0, psdReader_1.readInt16)(reader);
                 var flags = (0, psdReader_1.readUint16)(reader); // bit 1 always 1 ?
                 (0, psdReader_1.skipBytes)(reader, 18);
-                // TODO: 'combine' here might be wrong
                 path = {
                     open: selector === 3,
-                    operation: boolOp === -1 ? 'combine' : exports.booleanOperations[boolOp],
                     knots: [],
                     fillRule: flags === 2 ? 'non-zero' : 'even-odd',
                 };
+                if (boolOp !== -1)
+                    path.operation = exports.booleanOperations[boolOp];
                 paths.push(path);
                 break;
             }
@@ -264,7 +264,7 @@ addHandler('vmsk', hasKey('vectorMask'), function (reader, target, left, _a) {
         var path = _b[_i];
         (0, psdWriter_1.writeUint16)(writer, path.open ? 3 : 0);
         (0, psdWriter_1.writeUint16)(writer, path.knots.length);
-        (0, psdWriter_1.writeUint16)(writer, Math.abs(exports.booleanOperations.indexOf(path.operation))); // default to 1 if not found
+        (0, psdWriter_1.writeUint16)(writer, path.operation ? exports.booleanOperations.indexOf(path.operation) : -1); // -1 for undefined
         (0, psdWriter_1.writeUint16)(writer, path.fillRule === 'non-zero' ? 2 : 1);
         (0, psdWriter_1.writeZeros)(writer, 18); // TODO: these are sometimes non-zero
         var linkedKnot = path.open ? 4 : 1;
@@ -295,10 +295,10 @@ addHandler('vogk', hasKey('vectorOrigination'), function (reader, target, left)
             item.keyOriginResolution = i.keyOriginResolution;
         if (i.keyOriginShapeBBox) {
             item.keyOriginShapeBoundingBox = {
-                top: (0, descriptor_1.parseUnits)(i.keyOriginShapeBBox['Top ']),
-                left: (0, descriptor_1.parseUnits)(i.keyOriginShapeBBox.Left),
-                bottom: (0, descriptor_1.parseUnits)(i.keyOriginShapeBBox.Btom),
-                right: (0, descriptor_1.parseUnits)(i.keyOriginShapeBBox.Rght),
+                top: (0, descriptor_1.parseUnitsOrNumber)(i.keyOriginShapeBBox['Top ']),
+                left: (0, descriptor_1.parseUnitsOrNumber)(i.keyOriginShapeBBox.Left),
+                bottom: (0, descriptor_1.parseUnitsOrNumber)(i.keyOriginShapeBBox.Btom),
+                right: (0, descriptor_1.parseUnitsOrNumber)(i.keyOriginShapeBBox.Rght),
             };
         }
         var rectRadii = i.keyOriginRRectRadii;
@@ -1942,7 +1942,7 @@ if (helpers_1.MOCK_HANDLERS) {
     addHandler('vowv', // appears with Lr16 section ?
     function (// appears with Lr16 section ?
     _) { return false; }, function (reader, target, left) {
-        var value = (0, psdReader_1.readUint32)(reader); // 2 ????
+        var value = (0, psdReader_1.readUint32)(reader); // always 2 ????
         reader;
         target;
         console.log('vowv', { value: value }, left());