From 09efc34d1dca5ebd3b5b70106cc60da006fa109e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= Date: Sun, 1 Aug 2021 13:56:48 +0200 Subject: [PATCH 1/3] Corrected JPEG XL file type (cherry picked from commit 8f889c132ec48d8be7e155fc6d84254ffbb527df) --- src/bmffimage.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp index 073ead89ec..5ba0d775f9 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 5c872719c2689c165df40223ce789f9ceb791bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Kov=C3=A1=C5=99?= Date: Thu, 5 Aug 2021 10:04:51 +0200 Subject: [PATCH 2/3] Removed tag handled separately (cherry picked from commit 1d095cf75132e548213d740efc402b77178b2add) --- src/bmffimage.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/bmffimage.cpp b/src/bmffimage.cpp index 5ba0d775f9..ce36428946 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 aee4ac33f112bd5627534d350aaef70b6e09cc07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Thu, 12 Aug 2021 16:19:06 +0200 Subject: [PATCH 3/3] Update test for image/jxl (cherry picked from commit af0954ca0cce961d9ea95e728d964f0717d34bfd) --- 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