psd update

brendan-duncan · Nov 10, 2024 · 227bc1e · 227bc1e
1 parent 6fe284d
commit 227bc1e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/lib/src/formats/psd/psd_image.dart b/lib/src/formats/psd/psd_image.dart
@@ -143,7 +143,7 @@ class PsdImage implements DecodeInfo {
         //var di = (layer.top! + y) * width * 4 + layer.left! * 4;
         final dy = layer.top! + y;
         for (int? x = 0, sx = layer.left; x! < layer.width; ++x, ++sx) {
-          final srcP = src.getPixel(x, y);
+          final srcP = src!.getPixel(x, y);
           final br = srcP.r.toInt();
           final bg = srcP.g.toInt();
           final bb = srcP.b.toInt();

diff --git a/lib/src/formats/psd/psd_layer.dart b/lib/src/formats/psd/psd_layer.dart
@@ -80,7 +80,7 @@ class PsdLayer {
   Map<String, PsdLayerData> additionalData = {};
   List<PsdLayer> children = [];
   PsdLayer? parent;
-  late Image layerImage;
+  Image? layerImage;
   List<PsdEffect> effects = [];
 
   static const signature = 0x3842494d; // '8BIM'

diff --git a/test/_data/psd/rectangles.psd b/test/_data/psd/rectangles.psd
diff --git a/test/formats/psd_test.dart b/test/formats/psd_test.dart
@@ -11,18 +11,30 @@ void main() {
     final files = dir.listSync();
 
     group('psd', () {
-      for (var f in files.whereType<File>()) {
+      for (final f in files.whereType<File>()) {
         if (!f.path.endsWith('.psd')) {
           continue;
         }
 
         final name = f.uri.pathSegments.last;
         test(name, () {
-          final psd = PsdDecoder().decode(f.readAsBytesSync());
+          final decoder = PsdDecoder();
+          final psd = decoder.decode(f.readAsBytesSync());
           expect(psd, isNotNull);
           File('$testOutputPath/psd/$name.png')
             ..createSync(recursive: true)
             ..writeAsBytesSync(encodePng(psd!));
+
+          var li = 0;
+          for (final layer in decoder.info!.layers) {
+            final layerImg = layer.layerImage;
+            if (layerImg != null) {
+              File('$testOutputPath/psd/${name}_${li}_${layer.name}.png')
+                ..createSync(recursive: true)
+                ..writeAsBytesSync(encodePng(layerImg!));
+            }
+            ++li;
+          }
         });
       }
     });