LibGfx: Remove ILBM image format support

This format is not supported by other browsers.
0xForked · Jun 17, 2024 · a34a5af · a34a5af
1 parent b6daddb
commit a34a5af
Show file tree

Hide file tree

Showing 23 changed files with 0 additions and 618 deletions.
diff --git a/AK/Debug.h.in b/AK/Debug.h.in
@@ -110,10 +110,6 @@
 #    cmakedefine01 IDL_DEBUG
 #endif
 
-#ifndef ILBM_DEBUG
-#    cmakedefine01 ILBM_DEBUG
-#endif
-
 #ifndef IMAGE_DECODER_DEBUG
 #    cmakedefine01 IMAGE_DECODER_DEBUG
 #endif

diff --git a/Meta/CMake/all_the_debug_macros.cmake b/Meta/CMake/all_the_debug_macros.cmake
@@ -23,7 +23,6 @@ set(HTTPJOB_DEBUG ON)
 set(HUNKS_DEBUG ON)
 set(ICO_DEBUG ON)
 set(IDL_DEBUG ON)
-set(ILBM_DEBUG ON)
 set(IMAGE_DECODER_DEBUG ON)
 set(IMAGE_LOADER_DEBUG ON)
 set(JOB_DEBUG ON)

diff --git a/Meta/Lagom/Fuzzers/FuzzILBMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzILBMLoader.cpp
diff --git a/Meta/Lagom/Fuzzers/fuzzers.cmake b/Meta/Lagom/Fuzzers/fuzzers.cmake
@@ -13,7 +13,6 @@ set(FUZZER_TARGETS
     HttpRequest
     ICCProfile
     ICOLoader
-    ILBMLoader
     JPEG2000Loader
     JPEGLoader
     Js
@@ -71,7 +70,6 @@ set(FUZZER_DEPENDENCIES_GzipRoundtrip LibCompress)
 set(FUZZER_DEPENDENCIES_HttpRequest LibHTTP)
 set(FUZZER_DEPENDENCIES_ICCProfile LibGfx)
 set(FUZZER_DEPENDENCIES_ICOLoader LibGfx)
-set(FUZZER_DEPENDENCIES_ILBMLoader LibGfx)
 set(FUZZER_DEPENDENCIES_JPEG2000Loader LibGfx)
 set(FUZZER_DEPENDENCIES_JPEGLoader LibGfx)
 set(FUZZER_DEPENDENCIES_Js LibJS)

diff --git a/Meta/gn/secondary/AK/BUILD.gn b/Meta/gn/secondary/AK/BUILD.gn
@@ -244,7 +244,6 @@ write_cmake_config("ak_debug_gen") {
     "HUNKS_DEBUG=",
     "ICO_DEBUG=",
     "IDL_DEBUG=",
-    "ILBM_DEBUG=",
     "IMAGE_DECODER_DEBUG=",
     "IMAGE_LOADER_DEBUG=",
     "JOB_DEBUG=",

diff --git a/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn
@@ -63,7 +63,6 @@ shared_library("LibGfx") {
     "ImageFormats/CCITTDecoder.cpp",
     "ImageFormats/GIFLoader.cpp",
     "ImageFormats/ICOLoader.cpp",
-    "ImageFormats/ILBMLoader.cpp",
     "ImageFormats/ISOBMFF/Boxes.cpp",
     "ImageFormats/ISOBMFF/JPEG2000Boxes.cpp",
     "ImageFormats/ISOBMFF/Reader.cpp",

diff --git a/Tests/LibGfx/TestImageDecoder.cpp b/Tests/LibGfx/TestImageDecoder.cpp
@@ -10,7 +10,6 @@
 #include <LibGfx/ImageFormats/BMPLoader.h>
 #include <LibGfx/ImageFormats/GIFLoader.h>
 #include <LibGfx/ImageFormats/ICOLoader.h>
-#include <LibGfx/ImageFormats/ILBMLoader.h>
 #include <LibGfx/ImageFormats/ImageDecoder.h>
 #include <LibGfx/ImageFormats/JPEG2000Loader.h>
 #include <LibGfx/ImageFormats/JPEGLoader.h>
@@ -195,123 +194,6 @@ TEST_CASE(test_malformed_maskless_ico)
     EXPECT_EQ(frame.image->get_pixel(7, 4), Gfx::Color(161, 0, 0));
 }
 
-TEST_CASE(test_ilbm)
-{
-    auto file = TRY_OR_FAIL(Core::MappedFile::map(TEST_INPUT("ilbm/gradient.iff"sv)));
-    EXPECT(Gfx::ILBMImageDecoderPlugin::sniff(file->bytes()));
-    auto plugin_decoder = TRY_OR_FAIL(Gfx::ILBMImageDecoderPlugin::create(file->bytes()));
-
-    auto frame = TRY_OR_FAIL(expect_single_frame_of_size(*plugin_decoder, { 320, 200 }));
-
-    EXPECT_EQ(frame.image->get_pixel(8, 0), Gfx::Color(0xee, 0xbb, 0, 255));
-}
-
-TEST_CASE(test_ilbm_uncompressed)
-{
-    auto file = TRY_OR_FAIL(Core::MappedFile::map(TEST_INPUT("ilbm/gradient-uncompressed.iff"sv)));
-    EXPECT(Gfx::ILBMImageDecoderPlugin::sniff(file->bytes()));
-    auto plugin_decoder = TRY_OR_FAIL(Gfx::ILBMImageDecoderPlugin::create(file->bytes()));
-
-    auto frame = TRY_OR_FAIL(expect_single_frame_of_size(*plugin_decoder, { 320, 200 }));
-
-    EXPECT_EQ(frame.image->get_pixel(8, 0), Gfx::Color(0xee, 0xbb, 0, 255));
-}
-
-TEST_CASE(test_ilbm_ham6)
-{
-    auto file = TRY_OR_FAIL(Core::MappedFile::map(TEST_INPUT("ilbm/ham6.iff"sv)));
-    EXPECT(Gfx::ILBMImageDecoderPlugin::sniff(file->bytes()));
-    auto plugin_decoder = TRY_OR_FAIL(Gfx::ILBMImageDecoderPlugin::create(file->bytes()));
-
-    auto frame = TRY_OR_FAIL(expect_single_frame_of_size(*plugin_decoder, { 256, 256 }));
-
-    EXPECT_EQ(frame.image->get_pixel(77, 107), Gfx::Color(0xf0, 0x40, 0x40, 0xff));
-}
-
-TEST_CASE(test_ilbm_dos)
-{
-    auto file = TRY_OR_FAIL(Core::MappedFile::map(TEST_INPUT("ilbm/serenity.lbm"sv)));
-    EXPECT(Gfx::ILBMImageDecoderPlugin::sniff(file->bytes()));
-    auto plugin_decoder = TRY_OR_FAIL(Gfx::ILBMImageDecoderPlugin::create(file->bytes()));
-
-    auto frame = TRY_OR_FAIL(expect_single_frame_of_size(*plugin_decoder, { 640, 480 }));
-
-    EXPECT_EQ(frame.image->get_pixel(315, 134), Gfx::Color::NamedColor::Red);
-}
-
-TEST_CASE(test_24bit)
-{
-    auto file = TRY_OR_FAIL(Core::MappedFile::map(TEST_INPUT("ilbm/serenity-24bit.iff"sv)));
-    EXPECT(Gfx::ILBMImageDecoderPlugin::sniff(file->bytes()));
-    auto plugin_decoder = TRY_OR_FAIL(Gfx::ILBMImageDecoderPlugin::create(file->bytes()));
-
-    auto frame = TRY_OR_FAIL(expect_single_frame_of_size(*plugin_decoder, { 640, 640 }));
-
-    EXPECT_EQ(frame.image->get_pixel(158, 270), Gfx::Color(0xee, 0x3d, 0x3c, 255));
-}
-
-TEST_CASE(test_brush_transparent_color)
-{
-    auto file = TRY_OR_FAIL(Core::MappedFile::map(TEST_INPUT("ilbm/brush-transparent-color.iff"sv)));
-    EXPECT(Gfx::ILBMImageDecoderPlugin::sniff(file->bytes()));
-    auto plugin_decoder = TRY_OR_FAIL(Gfx::ILBMImageDecoderPlugin::create(file->bytes()));
-
-    auto frame = TRY_OR_FAIL(expect_single_frame_of_size(*plugin_decoder, { 266, 309 }));
-
-    EXPECT_EQ(frame.image->get_pixel(114, 103), Gfx::Color::NamedColor::Black);
-}
-
-TEST_CASE(test_small_24bit)
-{
-    auto file = TRY_OR_FAIL(Core::MappedFile::map(TEST_INPUT("ilbm/small-24bit.iff"sv)));
-    EXPECT(Gfx::ILBMImageDecoderPlugin::sniff(file->bytes()));
-    auto plugin_decoder = TRY_OR_FAIL(Gfx::ILBMImageDecoderPlugin::create(file->bytes()));
-
-    auto frame = TRY_OR_FAIL(expect_single_frame_of_size(*plugin_decoder, { 10, 10 }));
-
-    EXPECT_EQ(frame.image->get_pixel(0, 4), Gfx::Color(1, 0, 1, 255));
-}
-
-TEST_CASE(test_stencil_mask)
-{
-    auto file = TRY_OR_FAIL(Core::MappedFile::map(TEST_INPUT("ilbm/test-stencil.iff"sv)));
-    EXPECT(Gfx::ILBMImageDecoderPlugin::sniff(file->bytes()));
-    auto plugin_decoder = TRY_OR_FAIL(Gfx::ILBMImageDecoderPlugin::create(file->bytes()));
-
-    auto frame = TRY_OR_FAIL(expect_single_frame_of_size(*plugin_decoder, { 320, 200 }));
-
-    EXPECT_EQ(frame.image->get_pixel(0, 4), Gfx::Color(0, 0, 0, 255));
-}
-
-TEST_CASE(test_ilbm_malformed_header)
-{
-    Array test_inputs = {
-        TEST_INPUT("ilbm/truncated-bmhd-chunk.iff"sv)
-    };
-
-    for (auto test_input : test_inputs) {
-        auto file = TRY_OR_FAIL(Core::MappedFile::map(test_input));
-        auto plugin_decoder_or_error = Gfx::ILBMImageDecoderPlugin::create(file->bytes());
-        EXPECT(plugin_decoder_or_error.is_error());
-    }
-}
-
-TEST_CASE(test_ilbm_malformed_frame)
-{
-    Array test_inputs = {
-        TEST_INPUT("ilbm/incorrect-cmap-size.iff"sv),
-        TEST_INPUT("ilbm/incorrect-uncompressed-size.iff"sv),
-        TEST_INPUT("ilbm/missing-body-chunk.iff"sv)
-    };
-
-    for (auto test_input : test_inputs) {
-        auto file = TRY_OR_FAIL(Core::MappedFile::map(test_input));
-        auto plugin_decoder = TRY_OR_FAIL(Gfx::ILBMImageDecoderPlugin::create(file->bytes()));
-        auto frame_or_error = plugin_decoder->frame(0);
-        EXPECT(frame_or_error.is_error());
-    }
-}
-
 TEST_CASE(test_jpeg_sof0_one_scan)
 {
     auto file = TRY_OR_FAIL(Core::MappedFile::map(TEST_INPUT("jpg/rgb24.jpg"sv)));

diff --git a/Tests/LibGfx/test-inputs/ilbm/brush-transparent-color.iff b/Tests/LibGfx/test-inputs/ilbm/brush-transparent-color.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/gradient-uncompressed.iff b/Tests/LibGfx/test-inputs/ilbm/gradient-uncompressed.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/gradient.iff b/Tests/LibGfx/test-inputs/ilbm/gradient.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/ham6.iff b/Tests/LibGfx/test-inputs/ilbm/ham6.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/incorrect-cmap-size.iff b/Tests/LibGfx/test-inputs/ilbm/incorrect-cmap-size.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/incorrect-uncompressed-size.iff b/Tests/LibGfx/test-inputs/ilbm/incorrect-uncompressed-size.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/missing-body-chunk.iff b/Tests/LibGfx/test-inputs/ilbm/missing-body-chunk.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/serenity-24bit.iff b/Tests/LibGfx/test-inputs/ilbm/serenity-24bit.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/serenity.lbm b/Tests/LibGfx/test-inputs/ilbm/serenity.lbm
diff --git a/Tests/LibGfx/test-inputs/ilbm/small-24bit.iff b/Tests/LibGfx/test-inputs/ilbm/small-24bit.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/test-stencil.iff b/Tests/LibGfx/test-inputs/ilbm/test-stencil.iff
diff --git a/Tests/LibGfx/test-inputs/ilbm/truncated-bmhd-chunk.iff b/Tests/LibGfx/test-inputs/ilbm/truncated-bmhd-chunk.iff
diff --git a/Userland/Libraries/LibGfx/CMakeLists.txt b/Userland/Libraries/LibGfx/CMakeLists.txt
@@ -41,7 +41,6 @@ set(SOURCES
     ImageFormats/GIFLoader.cpp
     ImageFormats/GIFWriter.cpp
     ImageFormats/ICOLoader.cpp
-    ImageFormats/ILBMLoader.cpp
     ImageFormats/ImageDecoder.cpp
     ImageFormats/ISOBMFF/Boxes.cpp
     ImageFormats/ISOBMFF/JPEG2000Boxes.cpp