Add support for CR3 (#292)

Co-authored-by: LuttyYang <[email protected]>
sindresorhus · Jan 7, 2020 · 204599a · 204599a
1 parent 4210ddb
commit 204599a
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 16 deletions.
diff --git a/core.d.ts b/core.d.ts
@@ -11,6 +11,7 @@ declare namespace core {
 		| 'webp'
 		| 'flif'
 		| 'cr2'
+		| 'cr3'
 		| 'orf'
 		| 'arw'
 		| 'dng'
@@ -132,6 +133,7 @@ declare namespace core {
 		| 'image/webp'
 		| 'image/flif'
 		| 'image/x-canon-cr2'
+		| 'image/x-canon-cr3'
 		| 'image/tiff'
 		| 'image/bmp'
 		| 'image/vnd.ms-photo'

diff --git a/core.js b/core.js
@@ -435,6 +435,8 @@ async function fromTokenizer(tokenizer) {
 				return {ext: 'f4a', mime: 'audio/mp4'};
 			case 'F4B':
 				return {ext: 'f4b', mime: 'audio/mp4'};
+			case 'crx':
+				return {ext: 'cr3',	mime: 'image/x-canon-cr3'};
 			default:
 				if (brandMajor.startsWith('3g')) {
 					if (brandMajor.startsWith('3g2')) {
@@ -538,23 +540,15 @@ async function fromTokenizer(tokenizer) {
 		};
 	}
 
-	// `cr2`, `orf`, and `arw` need to be before `tif` check
-	if (
-		(check([0x49, 0x49, 0x2A, 0x0]) || check([0x4D, 0x4D, 0x0, 0x2A])) &&
-		check([0x43, 0x52], {offset: 8})
-	) {
-		return {
-			ext: 'cr2',
-			mime: 'image/x-canon-cr2'
-		};
-	}
+	if (check([0x49, 0x49, 0x2A, 0x0] || [0x4D, 0x4D, 0x0, 0x2A])) {
+		if (checkString('CR', {offset: 8})) {
+			return {
+				ext: 'cr2',
+				mime: 'image/x-canon-cr2'
+			};
+		}
 
-	if (
-		check([0x49, 0x49, 0x2A, 0x0])
-	) {
-		if (
-			check([0x1C, 0x00, 0xFE, 0x00], {offset: 8})
-		) {
+		if (check([0x1C, 0x00, 0xFE, 0x00], {offset: 8})) {
 			return {
 				ext: 'nef',
 				mime: 'image/x-nikon-nef'

diff --git a/fixture/fixture.cr3 b/fixture/fixture.cr3
diff --git a/package.json b/package.json
@@ -51,6 +51,7 @@
 		"webp",
 		"flif",
 		"cr2",
+		"cr3",
 		"orf",
 		"arw",
 		"dng",

diff --git a/readme.md b/readme.md
@@ -260,6 +260,7 @@ Returns a set of supported MIME types.
 - [`webp`](https://en.wikipedia.org/wiki/WebP)
 - [`flif`](https://en.wikipedia.org/wiki/Free_Lossless_Image_Format)
 - [`cr2`](https://fileinfo.com/extension/cr2) - Canon Raw image file (v2)
+- [`cr3`](https://fileinfo.com/extension/cr3) - Canon Raw image file (v3)
 - [`orf`](https://en.wikipedia.org/wiki/ORF_format) - Olympus Raw image file
 - [`arw`](https://en.wikipedia.org/wiki/Raw_image_format#ARW) - Sony Alpha Raw image file
 - [`dng`](https://en.wikipedia.org/wiki/Digital_Negative) - Adobe Digital Negative image file

diff --git a/supported.js b/supported.js
@@ -9,6 +9,7 @@ module.exports = {
 		'webp',
 		'flif',
 		'cr2',
+		'cr3',
 		'orf',
 		'arw',
 		'dng',
@@ -130,6 +131,7 @@ module.exports = {
 		'image/webp',
 		'image/flif',
 		'image/x-canon-cr2',
+		'image/x-canon-cr3',
 		'image/tiff',
 		'image/bmp',
 		'image/vnd.ms-photo',

diff --git a/test.js b/test.js
@@ -34,6 +34,9 @@ const names = {
 		'fixture4',
 		'fixture5'
 	],
+	cr3: [
+		'fixture'
+	],
 	dng: [
 		'fixture',
 		'fixture2'