ag-psd 28.1.0 → 28.2.0

package/README.md

@@ -164,18 +164,13 @@ Browser has to support `OffscreenCanvas` and `bitmaprenderer` context.
 importScripts('bundle.js');
 
 const createCanvas = (width, height) => {
-  const canvas = new OffscreenCanvas(width, height);
-  canvas.width = width;
-  canvas.height = height;
-  return canvas;
+  return new OffscreenCanvas(width, height);
 };
 
 const createCanvasFromData = (data) => {
   const image = new Image();
   image.src = 'data:image/jpeg;base64,' + agPsd.byteArrayToBase64(data);
   const canvas = new OffscreenCanvas(image.width, image.height);
-  canvas.width = image.width;
-  canvas.height = image.height;
   canvas.getContext('2d').drawImage(image, 0, 0);
   return canvas;
 };
@@ -227,18 +222,13 @@ xhr.send();
 importScripts('bundle.js');
 
 const createCanvas = (width, height) => {
-  const canvas = new OffscreenCanvas(width, height);
-  canvas.width = width;
-  canvas.height = height;
-  return canvas;
+  return OffscreenCanvas(width, height);
 };
 
 const createCanvasFromData = (data) => {
   const image = new Image();
   image.src = 'data:image/jpeg;base64,' + agPsd.byteArrayToBase64(data);
   const canvas = new OffscreenCanvas(image.width, image.height);
-  canvas.width = image.width;
-  canvas.height = image.height;
   canvas.getContext('2d').drawImage(image, 0, 0);
   return canvas;
 };

package/dist/additionalInfo.js

@@ -1363,8 +1363,18 @@ function parseFilterFXItem(f, options) {
                         } });
                 }
                 ;
+            case 'BrgC':
+                {
+                    return __assign(__assign({}, base), { type: 'brightness/contrast', filter: {
+                            brightness: f.Fltr.Brgh,
+                            contrast: f.Fltr.Cntr,
+                            useLegacy: !!f.Fltr.useLegacy,
+                        } });
+                }
+                ;
             default:
                 if (options.throwForMissingFeatures) {
+                    console.log('FILTER', require('util').inspect(f, false, 99, true));
                     throw new Error("Unknown filter classId: ".concat(f.Fltr._classID));
                 }
                 return undefined;
@@ -1384,9 +1394,10 @@ function parseFilterFXItem(f, options) {
             case 1181639749: return __assign(__assign({}, base), { type: 'find edges' });
             case 1399616122: return __assign(__assign({}, base), { type: 'solarize' });
             case 1314149187: return __assign(__assign({}, base), { type: 'ntsc colors' });
+            case 1231976050: return __assign(__assign({}, base), { type: 'invert' });
             default:
                 if (options.throwForMissingFeatures) {
-                    // console.log('FILTER', require('util').inspect(f, false, 99, true));
+                    console.log('FILTER', require('util').inspect(f, false, 99, true));
                     throw new Error("Unknown filterID: ".concat(f.filterID));
                 }
         }
@@ -1722,6 +1733,7 @@ function serializeFilterFXItem(f) {
                 IntC: descriptor_1.IntC.encode(f.filter.newFieldsBy),
             }, filterID: 1148089458 });
         case 'ntsc colors': return __assign(__assign({}, base), { filterID: 1314149187 });
+        case 'invert': return __assign(__assign({}, base), { filterID: 1231976050 });
         case 'custom': return __assign(__assign({}, base), { Fltr: {
                 _name: 'Custom',
                 _classID: 'Cstm',
@@ -1859,6 +1871,13 @@ function serializeFilterFXItem(f) {
                     Mpng: a.values,
                 }; }),
             }, filterID: 1131574899 });
+        case 'brightness/contrast': return __assign(__assign({}, base), { Fltr: {
+                _name: 'Brightness/Contrast',
+                _classID: 'BrgC',
+                Brgh: f.filter.brightness,
+                Cntr: f.filter.contrast,
+                useLegacy: !!f.filter.useLegacy,
+            }, filterID: 1114793795 });
         // case 'hsb/hsl': return {
         // TODO: ...
         // };
@@ -2883,7 +2902,8 @@ addHandler('thrs', adjustmentType('threshold'), function (reader, target, left)
 });
 var grdmColorModels = ['', '', '', 'rgb', 'hsb', '', 'lab'];
 addHandler('grdm', adjustmentType('gradient map'), function (reader, target, left) {
-    if ((0, psdReader_1.readUint16)(reader) !== 1)
+    var version = (0, psdReader_1.readUint16)(reader);
+    if (version !== 1 && version !== 3)
         throw new Error('Invalid grdm version');
     var info = {
         type: 'gradient map',
@@ -2891,6 +2911,12 @@ addHandler('grdm', adjustmentType('gradient map'), function (reader, target, lef
     };
     info.reverse = !!(0, psdReader_1.readUint8)(reader);
     info.dither = !!(0, psdReader_1.readUint8)(reader);
+    var hasMethod = !!(0, psdReader_1.readUint8)(reader);
+    reader.offset--;
+    if (hasMethod) {
+        var method = (0, psdReader_1.readSignature)(reader);
+        info.method = descriptor_1.gradientInterpolationMethodType.decode(method);
+    }
     info.name = (0, psdReader_1.readUnicodeString)(reader);
     info.colorStops = [];
     info.opacityStops = [];
@@ -2950,9 +2976,12 @@ addHandler('grdm', adjustmentType('gradient map'), function (reader, target, lef
 }, function (writer, target) {
     var _a, _b, _c;
     var info = target.adjustment;
-    (0, psdWriter_1.writeUint16)(writer, 1); // version
+    (0, psdWriter_1.writeUint16)(writer, info.method !== undefined ? 3 : 1); // version
     (0, psdWriter_1.writeUint8)(writer, info.reverse ? 1 : 0);
     (0, psdWriter_1.writeUint8)(writer, info.dither ? 1 : 0);
+    if (info.method !== undefined) {
+        (0, psdWriter_1.writeSignature)(writer, descriptor_1.gradientInterpolationMethodType.encode(info.method));
+    }
     (0, psdWriter_1.writeUnicodeStringWithPadding)(writer, info.name || '');
     (0, psdWriter_1.writeUint16)(writer, info.colorStops && info.colorStops.length || 0);
     var interpolation = Math.round(((_a = info.smoothness) !== null && _a !== void 0 ? _a : 1) * 4096);