1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
|
From 8f889c132ec48d8be7e155fc6d84254ffbb527df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv>
Date: Sun, 1 Aug 2021 13:56:48 +0200
Subject: [PATCH 1/3] Corrected JPEG XL file type
---
src/bmffimage.cpp | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
index 3d7c23e936..2440b4afd4 100644
--- a/src/bmffimage.cpp
+++ b/src/bmffimage.cpp
@@ -56,7 +56,8 @@
#define TAG_heix 0x68656978 /**< "heix" HEIC */
#define TAG_mif1 0x6d696631 /**< "mif1" HEIF */
#define TAG_crx 0x63727820 /**< "crx " Canon CR3 */
-#define TAG_jxl 0x4a584c20 /**< "JXL " JPEG XL */
+#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */
+#define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */
#define TAG_moov 0x6d6f6f76 /**< "moov" Movie */
#define TAG_meta 0x6d657461 /**< "meta" Metadata */
#define TAG_mdat 0x6d646174 /**< "mdat" Media data */
From 1d095cf75132e548213d740efc402b77178b2add Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= <peter.kovar@reflexion.tv>
Date: Thu, 5 Aug 2021 10:04:51 +0200
Subject: [PATCH 2/3] Removed tag handled separately
---
src/bmffimage.cpp | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp
index 2440b4afd4..9964a42bc2 100644
--- a/src/bmffimage.cpp
+++ b/src/bmffimage.cpp
@@ -56,7 +56,6 @@
#define TAG_heix 0x68656978 /**< "heix" HEIC */
#define TAG_mif1 0x6d696631 /**< "mif1" HEIF */
#define TAG_crx 0x63727820 /**< "crx " Canon CR3 */
-#define TAG_JXL 0x4a584c20 /**< "JXL " JPEG XL */
#define TAG_jxl 0x6a786c20 /**< "jxl " JPEG XL file type */
#define TAG_moov 0x6d6f6f76 /**< "moov" Movie */
#define TAG_meta 0x6d657461 /**< "meta" Metadata */
From af0954ca0cce961d9ea95e728d964f0717d34bfd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?=
<miloskomarcevic@aim.com>
Date: Thu, 12 Aug 2021 16:19:06 +0200
Subject: [PATCH 3/3] Update test for image/jxl
---
tests/bugfixes/github/test_issue_1503.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/bugfixes/github/test_issue_1503.py b/tests/bugfixes/github/test_issue_1503.py
index 51c0769135..3f88d26805 100644
--- a/tests/bugfixes/github/test_issue_1503.py
+++ b/tests/bugfixes/github/test_issue_1503.py
@@ -33,7 +33,7 @@ class issue_1503_jxl_bmff(metaclass=system_tests.CaseMeta):
Xmp.photoshop.DateCreated XmpText 10 2004-06-21
""","""File name : $filename
File size : 32892 Bytes
-MIME type : image/generic
+MIME type : image/jxl
Image size : 200 x 130
Thumbnail : image/jpeg, 4196 Bytes
Camera make : NIKON CORPORATION
|
GitWeb
