Fix gif animated decoder for dispose:2 frames

brendan-duncan · Dec 15, 2024 · a595a4c · a595a4c
1 parent 1d2cdae
commit a595a4c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 20 deletions.
diff --git a/lib/src/formats/gif_decoder.dart b/lib/src/formats/gif_decoder.dart
@@ -217,27 +217,22 @@ class GifDecoder extends Decoder {
       if (frame.disposal == 2) {
         nextImage.clear(colorMap.color(info!.backgroundColor!.r as int));
       } else if (frame.disposal != 3) {
-        if (frame.x != 0 ||
-            frame.y != 0 ||
-            frame.width != lastImage.width ||
-            frame.height != lastImage.height) {
-          if (frame.colorMap != null) {
-            final lp = lastImage.palette!;
-            final remapColors = <int, int>{};
-            for (var ci = 0; ci < colorMap.numColors; ++ci) {
-              final nc = colorMap.findColor(lp.getRed(ci), lp.getGreen(ci),
-                  lp.getBlue(ci), lp.getAlpha(ci));
-              remapColors[ci] = nc;
-            }
+        if (frame.colorMap != null) {
+          final lp = lastImage.palette!;
+          final remapColors = <int, int>{};
+          for (var ci = 0; ci < colorMap.numColors; ++ci) {
+            final nc = colorMap.findColor(lp.getRed(ci), lp.getGreen(ci),
+                lp.getBlue(ci), lp.getAlpha(ci));
+            remapColors[ci] = nc;
+          }
 
-            final nextBytes = nextImage.toUint8List();
-            final lastBytes = lastImage.toUint8List();
-            for (var i = 0, l = nextBytes.length; i < l; ++i) {
-              final lc = lastBytes[i];
-              final nc = remapColors[lc];
-              if (nc != -1) {
-                nextBytes[i] = nc!;
-              }
+          final nextBytes = nextImage.toUint8List();
+          final lastBytes = lastImage.toUint8List();
+          for (var i = 0, l = nextBytes.length; i < l; ++i) {
+            final lc = lastBytes[i];
+            final nc = remapColors[lc];
+            if (nc != -1) {
+              nextBytes[i] = nc!;
             }
           }
         }

diff --git a/test/_data/gif/lighthouse.gif b/test/_data/gif/lighthouse.gif