Fix compatibility issues with archive 3.x

brendan-duncan · Dec 19, 2024 · 5a8c2a7 · 5a8c2a7
1 parent 4bc9563
commit 5a8c2a7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/lib/src/font/bitmap_font.dart b/lib/src/font/bitmap_font.dart
@@ -3,6 +3,7 @@ import 'package:xml/xml.dart';
 
 import '../formats/png_decoder.dart';
 import '../image/image.dart';
+import '../util/_cast.dart';
 import '../util/image_exception.dart';
 
 /// Decode a [BitmapFont] from the contents of a zip file that stores the
@@ -205,7 +206,8 @@ class BitmapFont {
                   '$filename');
             }
 
-            final image = PngDecoder().decode(imageFile.content);
+            final image = PngDecoder()
+                .decode(castToUint8List(imageFile.content));
 
             fontPages[id] = image;
           }

diff --git a/lib/src/image/icc_profile.dart b/lib/src/image/icc_profile.dart
@@ -1,5 +1,6 @@
 import 'dart:typed_data';
 import 'package:archive/archive.dart';
+import '../util/_cast.dart';
 
 enum IccProfileCompression { none, deflate }
 
@@ -35,7 +36,7 @@ class IccProfile {
     if (compression == IccProfileCompression.none) {
       return data;
     }
-    data = const ZLibDecoder().decodeBytes(data);
+    data = castToUint8List(const ZLibDecoder().decodeBytes(data));
     compression = IccProfileCompression.none;
     return data;
   }

diff --git a/lib/src/util/_cast.dart b/lib/src/util/_cast.dart
@@ -0,0 +1,4 @@
+import 'dart:typed_data';
+
+Uint8List castToUint8List<T>(T data) =>
+    data is Uint8List ? data : data as Uint8List;