From 475f1b60830aecefc2df6e3abd4165f9d0b7626d Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Tue, 4 Jul 2023 00:16:52 -0400 Subject: [PATCH] LibCore+LibGfx+LibGUI: Consider JPEG XL files as images This includes registering the mime type and adding it to both the list of supported image format and the filter for images type in LibGUI. --- Userland/Libraries/LibCore/MimeData.cpp | 1 + Userland/Libraries/LibGUI/FileTypeFilter.h | 2 +- Userland/Libraries/LibGfx/Bitmap.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Userland/Libraries/LibCore/MimeData.cpp b/Userland/Libraries/LibCore/MimeData.cpp index 1ab3f14cd2..ce6de165d0 100644 --- a/Userland/Libraries/LibCore/MimeData.cpp +++ b/Userland/Libraries/LibCore/MimeData.cpp @@ -123,6 +123,7 @@ static Array const s_registered_mime_type = { MimeType { .name = "image/gif"sv, .common_extensions = { ".gif"sv }, .description = "GIF image data"sv, .magic_bytes = Vector { 'G', 'I', 'F', '8', '7', 'a' } }, MimeType { .name = "image/gif"sv, .common_extensions = { ".gif"sv }, .description = "GIF image data"sv, .magic_bytes = Vector { 'G', 'I', 'F', '8', '9', 'a' } }, MimeType { .name = "image/jpeg"sv, .common_extensions = { ".jpg"sv, ".jpeg"sv }, .description = "JPEG image data"sv, .magic_bytes = Vector { 0xFF, 0xD8, 0xFF } }, + MimeType { .name = "image/jxl"sv, .common_extensions = { ".jxl"sv }, .description = "JPEG XL image data"sv, .magic_bytes = Vector { 0xFF, 0x0A } }, MimeType { .name = "image/png"sv, .common_extensions = { ".png"sv }, .description = "PNG image data"sv, .magic_bytes = Vector { 0x89, 'P', 'N', 'G', 0x0D, 0x0A, 0x1A, 0x0A } }, MimeType { .name = "image/svg+xml"sv, .common_extensions = { ".svg"sv }, .description = "Scalable Vector Graphics image"sv }, MimeType { .name = "image/tiff"sv, .common_extensions = { ".tiff"sv }, .description = "TIFF image data"sv, .magic_bytes = Vector { 'I', 'I', '*', 0x00 } }, diff --git a/Userland/Libraries/LibGUI/FileTypeFilter.h b/Userland/Libraries/LibGUI/FileTypeFilter.h index d2948572a6..f101a023a2 100644 --- a/Userland/Libraries/LibGUI/FileTypeFilter.h +++ b/Userland/Libraries/LibGUI/FileTypeFilter.h @@ -25,7 +25,7 @@ struct FileTypeFilter { static FileTypeFilter image_files() { - return FileTypeFilter { "Image Files", Vector { "png", "gif", "bmp", "dip", "pbm", "pgm", "ppm", "ico", "jpeg", "jpg", "dds", "qoi", "webp", "tvg" } }; + return FileTypeFilter { "Image Files", Vector { "png", "gif", "bmp", "dip", "pbm", "pgm", "ppm", "ico", "jpeg", "jpg", "jxl", "dds", "qoi", "webp", "tvg" } }; } }; diff --git a/Userland/Libraries/LibGfx/Bitmap.h b/Userland/Libraries/LibGfx/Bitmap.h index fbae93387f..61e641bca9 100644 --- a/Userland/Libraries/LibGfx/Bitmap.h +++ b/Userland/Libraries/LibGfx/Bitmap.h @@ -26,6 +26,7 @@ __ENUMERATE_IMAGE_FORMAT(ico, ".ico") \ __ENUMERATE_IMAGE_FORMAT(jpeg, ".jpg") \ __ENUMERATE_IMAGE_FORMAT(jpeg, ".jpeg") \ + __ENUMERATE_IMAGE_FORMAT(jxl, ".jxl") \ __ENUMERATE_IMAGE_FORMAT(dds, ".dds") \ __ENUMERATE_IMAGE_FORMAT(qoi, ".qoi") \ __ENUMERATE_IMAGE_FORMAT(tga, ".tga") \