From 3c190a00dd0538df9e05e04fddaac60af11ce1e9 Mon Sep 17 00:00:00 2001 From: IreuN Date: Fri, 30 May 2025 14:57:45 +0200 Subject: [PATCH 1/6] Add Canon Raw CR2 mimeType --- pkgs/mime/lib/src/default_extension_map.dart | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/mime/lib/src/default_extension_map.dart b/pkgs/mime/lib/src/default_extension_map.dart index 287c957dc5..59536a0b98 100644 --- a/pkgs/mime/lib/src/default_extension_map.dart +++ b/pkgs/mime/lib/src/default_extension_map.dart @@ -131,6 +131,7 @@ const Map defaultExtensionMap = { 'cpio': 'application/x-cpio', 'cpp': 'text/x-c', 'cpt': 'application/mac-compactpro', + 'cr2': 'image/x-canon-cr2', 'crd': 'application/x-mscardfile', 'crl': 'application/pkix-crl', 'crt': 'application/x-x509-ca-cert', From bfecb4287b21c608cb29b928f1a3dfb5daa5d7ce Mon Sep 17 00:00:00 2001 From: IreuN Date: Fri, 30 May 2025 15:25:38 +0200 Subject: [PATCH 2/6] Add 'image/x-canon-cr2' to changelog --- pkgs/mime/CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/mime/CHANGELOG.md b/pkgs/mime/CHANGELOG.md index fd5a24905c..5cddeabc86 100644 --- a/pkgs/mime/CHANGELOG.md +++ b/pkgs/mime/CHANGELOG.md @@ -1,3 +1,6 @@ +## 2.0.1 +* Add `image/image/x-canon-cr2` mimeType lookup by extension. + ## 2.0.0 * **[Breaking]** `extensionFromMime(String mimeType)` returns `null` instead of `mimeType` for an unknown mime type. From 4a6e1f6fda91d4a0da4da6f06e8ff79db4bd0467 Mon Sep 17 00:00:00 2001 From: IreuN Date: Fri, 30 May 2025 15:25:59 +0200 Subject: [PATCH 3/6] typo --- pkgs/mime/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/mime/CHANGELOG.md b/pkgs/mime/CHANGELOG.md index 5cddeabc86..9e8506ac41 100644 --- a/pkgs/mime/CHANGELOG.md +++ b/pkgs/mime/CHANGELOG.md @@ -1,5 +1,5 @@ ## 2.0.1 -* Add `image/image/x-canon-cr2` mimeType lookup by extension. +* Add `image/x-canon-cr2` mimeType lookup by extension. ## 2.0.0 From f1497e4142106b77178e44f225563d7019a4ee47 Mon Sep 17 00:00:00 2001 From: IreuN Date: Fri, 30 May 2025 16:41:12 +0200 Subject: [PATCH 4/6] Add MagicNumber for `image/tiff` --- pkgs/mime/lib/src/magic_number.dart | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/mime/lib/src/magic_number.dart b/pkgs/mime/lib/src/magic_number.dart index c8b5c3be13..d442489a27 100644 --- a/pkgs/mime/lib/src/magic_number.dart +++ b/pkgs/mime/lib/src/magic_number.dart @@ -103,6 +103,9 @@ const List initialMagicNumbers = [ MagicNumber('image/gif', [0x47, 0x49, 0x46, 0x38, 0x39, 0x61]), MagicNumber('image/jpeg', [0xFF, 0xD8]), MagicNumber('image/png', [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]), + MagicNumber('image/x-canon-cr2', // Since CR2 is based on tiff, this MagicNumber needs to be above `image/tiff` + [0x49, 0x49, 0x2A, 0x00, 0x10, 0x00, 0x00, 0x00, 0x43, 0x52, 0x02], + [0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF]), MagicNumber('image/tiff', [0x49, 0x49, 0x2A, 0x00]), MagicNumber('image/tiff', [0x4D, 0x4D, 0x00, 0x2A]), MagicNumber('audio/aac', [0xFF, 0xF1]), From b1a0e25c2254ff7a5ffebeb50e58cf576541d5dc Mon Sep 17 00:00:00 2001 From: IreuN Date: Fri, 30 May 2025 16:42:09 +0200 Subject: [PATCH 5/6] Add 'image/x-canon-cr2' to changelog --- pkgs/mime/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/mime/CHANGELOG.md b/pkgs/mime/CHANGELOG.md index 9e8506ac41..cf0fc9df41 100644 --- a/pkgs/mime/CHANGELOG.md +++ b/pkgs/mime/CHANGELOG.md @@ -1,5 +1,5 @@ ## 2.0.1 -* Add `image/x-canon-cr2` mimeType lookup by extension. +* Add `image/x-canon-cr2` mimeType lookup by extension and header bytes. ## 2.0.0 From 78e233fb0f64644fe6448edc94a58b9c9d63c838 Mon Sep 17 00:00:00 2001 From: IreuN Date: Mon, 2 Jun 2025 06:47:10 +0200 Subject: [PATCH 6/6] Update magic_number.dart --- pkgs/mime/lib/src/magic_number.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/mime/lib/src/magic_number.dart b/pkgs/mime/lib/src/magic_number.dart index d442489a27..0931b21ea3 100644 --- a/pkgs/mime/lib/src/magic_number.dart +++ b/pkgs/mime/lib/src/magic_number.dart @@ -105,7 +105,7 @@ const List initialMagicNumbers = [ MagicNumber('image/png', [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A]), MagicNumber('image/x-canon-cr2', // Since CR2 is based on tiff, this MagicNumber needs to be above `image/tiff` [0x49, 0x49, 0x2A, 0x00, 0x10, 0x00, 0x00, 0x00, 0x43, 0x52, 0x02], - [0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF]), +mask: [0xFF, 0xFF, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0xFF]), MagicNumber('image/tiff', [0x49, 0x49, 0x2A, 0x00]), MagicNumber('image/tiff', [0x4D, 0x4D, 0x00, 0x2A]), MagicNumber('audio/aac', [0xFF, 0xF1]),