From 496b7ffb2b58043a80d90b8b8f44cab1eaa874e8 Mon Sep 17 00:00:00 2001 From: Lucas CHOLLET Date: Tue, 21 Mar 2023 14:58:06 -0400 Subject: [PATCH] LibGfx: Move all image loaders and writers to a subdirectory --- Ladybird/ImageCodecPluginLadybird.cpp | 2 +- Ladybird/WebContentView.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzICOLoader.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzQOILoader.cpp | 2 +- Meta/Lagom/Fuzzers/FuzzTGALoader.cpp | 2 +- Tests/LibGL/TestRender.cpp | 2 +- Tests/LibGL/TestShaders.cpp | 2 +- Tests/LibGfx/TestICCProfile.cpp | 6 ++-- Tests/LibGfx/TestImageDecoder.cpp | 22 ++++++------ .../Applications/Browser/BrowserWindow.cpp | 2 +- Userland/Applications/Magnifier/main.cpp | 6 ++-- Userland/Applications/PixelPaint/Image.cpp | 6 ++-- Userland/Demos/Mandelbrot/Mandelbrot.cpp | 6 ++-- .../Libraries/LibGUI/FileIconProvider.cpp | 2 +- Userland/Libraries/LibGUI/ImageWidget.cpp | 2 +- Userland/Libraries/LibGUI/ImageWidget.h | 2 +- Userland/Libraries/LibGfx/Bitmap.cpp | 2 +- Userland/Libraries/LibGfx/CMakeLists.txt | 34 +++++++++---------- .../Libraries/LibGfx/Font/OpenType/Font.cpp | 2 +- .../LibGfx/{ => ImageFormats}/BMPLoader.cpp | 2 +- .../LibGfx/{ => ImageFormats}/BMPLoader.h | 4 +-- .../LibGfx/{ => ImageFormats}/BMPWriter.cpp | 2 +- .../LibGfx/{ => ImageFormats}/BMPWriter.h | 0 .../LibGfx/{ => ImageFormats}/DDSLoader.cpp | 2 +- .../LibGfx/{ => ImageFormats}/DDSLoader.h | 2 +- .../LibGfx/{ => ImageFormats}/GIFLoader.cpp | 2 +- .../LibGfx/{ => ImageFormats}/GIFLoader.h | 2 +- .../LibGfx/{ => ImageFormats}/ICOLoader.cpp | 6 ++-- .../LibGfx/{ => ImageFormats}/ICOLoader.h | 2 +- .../{ => ImageFormats}/ImageDecoder.cpp | 26 +++++++------- .../LibGfx/{ => ImageFormats}/ImageDecoder.h | 0 .../LibGfx/{ => ImageFormats}/JPEGLoader.cpp | 2 +- .../LibGfx/{ => ImageFormats}/JPEGLoader.h | 2 +- .../LibGfx/{ => ImageFormats}/PBMLoader.cpp | 4 +-- .../LibGfx/{ => ImageFormats}/PBMLoader.h | 4 +-- .../LibGfx/{ => ImageFormats}/PGMLoader.cpp | 6 ++-- .../LibGfx/{ => ImageFormats}/PGMLoader.h | 4 +-- .../LibGfx/{ => ImageFormats}/PNGLoader.cpp | 4 +-- .../LibGfx/{ => ImageFormats}/PNGLoader.h | 2 +- .../LibGfx/{ => ImageFormats}/PNGShared.h | 0 .../LibGfx/{ => ImageFormats}/PNGWriter.cpp | 2 +- .../LibGfx/{ => ImageFormats}/PNGWriter.h | 2 +- .../LibGfx/{ => ImageFormats}/PPMLoader.cpp | 2 +- .../LibGfx/{ => ImageFormats}/PPMLoader.h | 4 +-- .../PortableFormatWriter.cpp | 0 .../{ => ImageFormats}/PortableFormatWriter.h | 0 .../PortableImageLoaderCommon.h | 2 +- .../PortableImageMapLoader.h | 2 +- .../LibGfx/{ => ImageFormats}/QOILoader.cpp | 2 +- .../LibGfx/{ => ImageFormats}/QOILoader.h | 2 +- .../LibGfx/{ => ImageFormats}/QOIWriter.cpp | 0 .../LibGfx/{ => ImageFormats}/QOIWriter.h | 0 .../LibGfx/{ => ImageFormats}/TGALoader.cpp | 2 +- .../LibGfx/{ => ImageFormats}/TGALoader.h | 2 +- .../LibGfx/{ => ImageFormats}/WebPLoader.cpp | 2 +- .../LibGfx/{ => ImageFormats}/WebPLoader.h | 2 +- Userland/Libraries/LibPDF/Filter.cpp | 2 +- .../LibWeb/HTML/HTMLCanvasElement.cpp | 2 +- .../Libraries/LibWeb/Loader/FrameLoader.cpp | 2 +- .../ImageDecoder/ConnectionFromClient.cpp | 2 +- Userland/Services/SpiceAgent/SpiceAgent.cpp | 8 ++--- Userland/Utilities/file.cpp | 2 +- Userland/Utilities/headless-browser.cpp | 2 +- Userland/Utilities/icc.cpp | 2 +- Userland/Utilities/image.cpp | 10 +++--- Userland/Utilities/shot.cpp | 2 +- 73 files changed, 129 insertions(+), 129 deletions(-) rename Userland/Libraries/LibGfx/{ => ImageFormats}/BMPLoader.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/BMPLoader.h (93%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/BMPWriter.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/BMPWriter.h (100%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/DDSLoader.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/DDSLoader.h (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/GIFLoader.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/GIFLoader.h (95%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/ICOLoader.cpp (98%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/ICOLoader.h (95%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/ImageDecoder.cpp (85%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/ImageDecoder.h (100%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/JPEGLoader.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/JPEGLoader.h (95%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PBMLoader.cpp (95%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PBMLoader.h (85%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PGMLoader.cpp (93%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PGMLoader.h (86%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PNGLoader.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PNGLoader.h (95%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PNGShared.h (100%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PNGWriter.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PNGWriter.h (96%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PPMLoader.cpp (98%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PPMLoader.h (86%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PortableFormatWriter.cpp (100%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PortableFormatWriter.h (100%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PortableImageLoaderCommon.h (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/PortableImageMapLoader.h (98%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/QOILoader.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/QOILoader.h (97%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/QOIWriter.cpp (100%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/QOIWriter.h (100%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/TGALoader.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/TGALoader.h (95%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/WebPLoader.cpp (99%) rename Userland/Libraries/LibGfx/{ => ImageFormats}/WebPLoader.h (95%) diff --git a/Ladybird/ImageCodecPluginLadybird.cpp b/Ladybird/ImageCodecPluginLadybird.cpp index bb1687f2e3d..40faf29f55e 100644 --- a/Ladybird/ImageCodecPluginLadybird.cpp +++ b/Ladybird/ImageCodecPluginLadybird.cpp @@ -9,7 +9,7 @@ #include "ImageCodecPluginLadybird.h" #include -#include +#include #include namespace Ladybird { diff --git a/Ladybird/WebContentView.cpp b/Ladybird/WebContentView.cpp index 7f3769c89cd..a67f72d8654 100644 --- a/Ladybird/WebContentView.cpp +++ b/Ladybird/WebContentView.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp b/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp index 8a701ab518c..d64d22bd1fb 100644 --- a/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size) diff --git a/Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp b/Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp index 5de7cb6f794..6730ef50d63 100644 --- a/Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include diff --git a/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp b/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp index 1e4b995f407..d44337f9a79 100644 --- a/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzICOLoader.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp b/Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp index c85de25cdd4..4b359c7479e 100644 --- a/Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp index e2cc65711bb..5141f0bc055 100644 --- a/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp index bea425c0684..a07308f46c2 100644 --- a/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp index a871d1ef83f..50cf86c71ef 100644 --- a/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp b/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp index 4b78866e733..5b599f6761d 100644 --- a/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Meta/Lagom/Fuzzers/FuzzQOILoader.cpp b/Meta/Lagom/Fuzzers/FuzzQOILoader.cpp index caf278b28f8..70cc7836208 100644 --- a/Meta/Lagom/Fuzzers/FuzzQOILoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzQOILoader.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Meta/Lagom/Fuzzers/FuzzTGALoader.cpp b/Meta/Lagom/Fuzzers/FuzzTGALoader.cpp index 4d1848e0b4f..728c931f4d7 100644 --- a/Meta/Lagom/Fuzzers/FuzzTGALoader.cpp +++ b/Meta/Lagom/Fuzzers/FuzzTGALoader.cpp @@ -4,7 +4,7 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include +#include #include #include diff --git a/Tests/LibGL/TestRender.cpp b/Tests/LibGL/TestRender.cpp index 35f38e8a210..a69e14f7259 100644 --- a/Tests/LibGL/TestRender.cpp +++ b/Tests/LibGL/TestRender.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #ifdef AK_OS_SERENITY diff --git a/Tests/LibGL/TestShaders.cpp b/Tests/LibGL/TestShaders.cpp index f1014521318..546e8c5c08e 100644 --- a/Tests/LibGL/TestShaders.cpp +++ b/Tests/LibGL/TestShaders.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include static NonnullOwnPtr create_testing_context(int width, int height) diff --git a/Tests/LibGfx/TestICCProfile.cpp b/Tests/LibGfx/TestICCProfile.cpp index a77e3a961c7..184365bdff0 100644 --- a/Tests/LibGfx/TestICCProfile.cpp +++ b/Tests/LibGfx/TestICCProfile.cpp @@ -9,9 +9,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #ifdef AK_OS_SERENITY diff --git a/Tests/LibGfx/TestImageDecoder.cpp b/Tests/LibGfx/TestImageDecoder.cpp index f5a1533438d..e75f0c8fa42 100644 --- a/Tests/LibGfx/TestImageDecoder.cpp +++ b/Tests/LibGfx/TestImageDecoder.cpp @@ -7,17 +7,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/Userland/Applications/Browser/BrowserWindow.cpp b/Userland/Applications/Browser/BrowserWindow.cpp index b796b8c586a..9e9101f3bf9 100644 --- a/Userland/Applications/Browser/BrowserWindow.cpp +++ b/Userland/Applications/Browser/BrowserWindow.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Applications/Magnifier/main.cpp b/Userland/Applications/Magnifier/main.cpp index 7f8273546ff..19138489e64 100644 --- a/Userland/Applications/Magnifier/main.cpp +++ b/Userland/Applications/Magnifier/main.cpp @@ -18,10 +18,10 @@ #include #include #include -#include #include -#include -#include +#include +#include +#include #include static ErrorOr dump_bitmap(RefPtr bitmap, AK::StringView extension) diff --git a/Userland/Applications/PixelPaint/Image.cpp b/Userland/Applications/PixelPaint/Image.cpp index 03940ad014d..8c6a979ea43 100644 --- a/Userland/Applications/PixelPaint/Image.cpp +++ b/Userland/Applications/PixelPaint/Image.cpp @@ -12,10 +12,10 @@ #include #include #include -#include #include -#include -#include +#include +#include +#include #include #include diff --git a/Userland/Demos/Mandelbrot/Mandelbrot.cpp b/Userland/Demos/Mandelbrot/Mandelbrot.cpp index 405481e1ade..b3c3064d216 100644 --- a/Userland/Demos/Mandelbrot/Mandelbrot.cpp +++ b/Userland/Demos/Mandelbrot/Mandelbrot.cpp @@ -16,10 +16,10 @@ #include #include #include -#include #include -#include -#include +#include +#include +#include #include #include diff --git a/Userland/Libraries/LibGUI/FileIconProvider.cpp b/Userland/Libraries/LibGUI/FileIconProvider.cpp index 0b58a83b13c..d85ea00612d 100644 --- a/Userland/Libraries/LibGUI/FileIconProvider.cpp +++ b/Userland/Libraries/LibGUI/FileIconProvider.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibGUI/ImageWidget.cpp b/Userland/Libraries/LibGUI/ImageWidget.cpp index 3de928bc469..c57de3804e5 100644 --- a/Userland/Libraries/LibGUI/ImageWidget.cpp +++ b/Userland/Libraries/LibGUI/ImageWidget.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include REGISTER_WIDGET(GUI, ImageWidget) diff --git a/Userland/Libraries/LibGUI/ImageWidget.h b/Userland/Libraries/LibGUI/ImageWidget.h index 967bb192471..f7ee3e1b22b 100644 --- a/Userland/Libraries/LibGUI/ImageWidget.h +++ b/Userland/Libraries/LibGUI/ImageWidget.h @@ -9,7 +9,7 @@ #include #include -#include +#include namespace GUI { diff --git a/Userland/Libraries/LibGfx/Bitmap.cpp b/Userland/Libraries/LibGfx/Bitmap.cpp index 0964109c739..e98a200cff5 100644 --- a/Userland/Libraries/LibGfx/Bitmap.cpp +++ b/Userland/Libraries/LibGfx/Bitmap.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibGfx/CMakeLists.txt b/Userland/Libraries/LibGfx/CMakeLists.txt index 38923c5e72b..408b8aec58c 100644 --- a/Userland/Libraries/LibGfx/CMakeLists.txt +++ b/Userland/Libraries/LibGfx/CMakeLists.txt @@ -1,15 +1,12 @@ set(SOURCES AffineTransform.cpp AntiAliasingPainter.cpp - BMPLoader.cpp - BMPWriter.cpp Bitmap.cpp BitmapMixer.cpp ClassicStylePainter.cpp ClassicWindowTheme.cpp Color.cpp CursorParams.cpp - DDSLoader.cpp FillPathImplementation.cpp Filters/ColorBlindnessFilter.cpp Filters/FastBoxBlurFilter.cpp @@ -28,27 +25,32 @@ set(SOURCES Font/Typeface.cpp Font/WOFF/Font.cpp GradientPainting.cpp - GIFLoader.cpp ICC/BinaryWriter.cpp ICC/Profile.cpp ICC/Tags.cpp ICC/TagTypes.cpp ICC/WellKnownProfiles.cpp - ICOLoader.cpp - ImageDecoder.cpp - JPEGLoader.cpp - PBMLoader.cpp - PGMLoader.cpp - PNGLoader.cpp - PNGWriter.cpp - PortableFormatWriter.cpp - PPMLoader.cpp + ImageFormats/BMPLoader.cpp + ImageFormats/BMPWriter.cpp + ImageFormats/DDSLoader.cpp + ImageFormats/GIFLoader.cpp + ImageFormats/ICOLoader.cpp + ImageFormats/ImageDecoder.cpp + ImageFormats/JPEGLoader.cpp + ImageFormats/PBMLoader.cpp + ImageFormats/PGMLoader.cpp + ImageFormats/PNGLoader.cpp + ImageFormats/PNGWriter.cpp + ImageFormats/PortableFormatWriter.cpp + ImageFormats/PPMLoader.cpp + ImageFormats/QOILoader.cpp + ImageFormats/QOIWriter.cpp + ImageFormats/TGALoader.cpp + ImageFormats/WebPLoader.cpp Painter.cpp Palette.cpp Path.cpp Point.cpp - QOILoader.cpp - QOIWriter.cpp Rect.cpp ShareableBitmap.cpp Size.cpp @@ -56,9 +58,7 @@ set(SOURCES SystemTheme.cpp TextDirection.cpp TextLayout.cpp - TGALoader.cpp Triangle.cpp - WebPLoader.cpp WindowTheme.cpp ) diff --git a/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp b/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp index 8216a8a96a4..8dc47a2e9e9 100644 --- a/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp +++ b/Userland/Libraries/LibGfx/Font/OpenType/Font.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibGfx/BMPLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/BMPLoader.cpp similarity index 99% rename from Userland/Libraries/LibGfx/BMPLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/BMPLoader.cpp index bae791c339c..76c9e25d881 100644 --- a/Userland/Libraries/LibGfx/BMPLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/BMPLoader.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/BMPLoader.h b/Userland/Libraries/LibGfx/ImageFormats/BMPLoader.h similarity index 93% rename from Userland/Libraries/LibGfx/BMPLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/BMPLoader.h index 6430d66f94b..7999a4a76ed 100644 --- a/Userland/Libraries/LibGfx/BMPLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/BMPLoader.h @@ -6,8 +6,8 @@ #pragma once -#include -#include +#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/BMPWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/BMPWriter.cpp similarity index 99% rename from Userland/Libraries/LibGfx/BMPWriter.cpp rename to Userland/Libraries/LibGfx/ImageFormats/BMPWriter.cpp index a755946a076..fb569984072 100644 --- a/Userland/Libraries/LibGfx/BMPWriter.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/BMPWriter.cpp @@ -4,8 +4,8 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include #include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/BMPWriter.h b/Userland/Libraries/LibGfx/ImageFormats/BMPWriter.h similarity index 100% rename from Userland/Libraries/LibGfx/BMPWriter.h rename to Userland/Libraries/LibGfx/ImageFormats/BMPWriter.h diff --git a/Userland/Libraries/LibGfx/DDSLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp similarity index 99% rename from Userland/Libraries/LibGfx/DDSLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp index f2775dbfeec..8f2f889f8b9 100644 --- a/Userland/Libraries/LibGfx/DDSLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibGfx/DDSLoader.h b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h similarity index 99% rename from Userland/Libraries/LibGfx/DDSLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h index bc9c6e250fb..4e7d213add4 100644 --- a/Userland/Libraries/LibGfx/DDSLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h @@ -6,7 +6,7 @@ #pragma once -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/GIFLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp similarity index 99% rename from Userland/Libraries/LibGfx/GIFLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp index 1809b21feb8..79da2033d02 100644 --- a/Userland/Libraries/LibGfx/GIFLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/GIFLoader.h b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h similarity index 95% rename from Userland/Libraries/LibGfx/GIFLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h index deaa011beae..88975716bef 100644 --- a/Userland/Libraries/LibGfx/GIFLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h @@ -7,7 +7,7 @@ #pragma once #include -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/ICOLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp similarity index 98% rename from Userland/Libraries/LibGfx/ICOLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp index 0e9cbd16678..87aa56ffe84 100644 --- a/Userland/Libraries/LibGfx/ICOLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp @@ -8,9 +8,9 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/ICOLoader.h b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h similarity index 95% rename from Userland/Libraries/LibGfx/ICOLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h index eecd7d396b7..bef1c4cf87d 100644 --- a/Userland/Libraries/LibGfx/ICOLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h @@ -6,7 +6,7 @@ #pragma once -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/ImageDecoder.cpp b/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.cpp similarity index 85% rename from Userland/Libraries/LibGfx/ImageDecoder.cpp rename to Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.cpp index 19c96d9f83d..b8a8ff4207f 100644 --- a/Userland/Libraries/LibGfx/ImageDecoder.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.cpp @@ -5,19 +5,19 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/ImageDecoder.h b/Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h similarity index 100% rename from Userland/Libraries/LibGfx/ImageDecoder.h rename to Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h diff --git a/Userland/Libraries/LibGfx/JPEGLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp similarity index 99% rename from Userland/Libraries/LibGfx/JPEGLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp index e76dc760fae..d0040c727c6 100644 --- a/Userland/Libraries/LibGfx/JPEGLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #define JPEG_INVALID 0X0000 diff --git a/Userland/Libraries/LibGfx/JPEGLoader.h b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h similarity index 95% rename from Userland/Libraries/LibGfx/JPEGLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h index 2890d803c30..fc650f8fb8f 100644 --- a/Userland/Libraries/LibGfx/JPEGLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h @@ -7,7 +7,7 @@ #pragma once #include -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PBMLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PBMLoader.cpp similarity index 95% rename from Userland/Libraries/LibGfx/PBMLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/PBMLoader.cpp index 8a60c851ffb..dff6a12d662 100644 --- a/Userland/Libraries/LibGfx/PBMLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/PBMLoader.cpp @@ -6,9 +6,9 @@ */ #include "PBMLoader.h" +#include "AK/Endian.h" #include "PortableImageLoaderCommon.h" -#include "Streamer.h" -#include +#include "Userland/Libraries/LibGfx/Streamer.h" #include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PBMLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PBMLoader.h similarity index 85% rename from Userland/Libraries/LibGfx/PBMLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/PBMLoader.h index e37d037f203..37705432b3a 100644 --- a/Userland/Libraries/LibGfx/PBMLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PBMLoader.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PGMLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp similarity index 93% rename from Userland/Libraries/LibGfx/PGMLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp index a211209f83d..02405480133 100644 --- a/Userland/Libraries/LibGfx/PGMLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp @@ -5,10 +5,10 @@ * SPDX-License-Identifier: BSD-2-Clause */ -#include "PGMLoader.h" -#include "PortableImageLoaderCommon.h" -#include "Streamer.h" #include +#include +#include +#include #include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PGMLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.h similarity index 86% rename from Userland/Libraries/LibGfx/PGMLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/PGMLoader.h index f5b4778042b..087a5a4c6b8 100644 --- a/Userland/Libraries/LibGfx/PGMLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PGMLoader.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PNGLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp similarity index 99% rename from Userland/Libraries/LibGfx/PNGLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp index 26a00a59080..2ec92ef34f1 100644 --- a/Userland/Libraries/LibGfx/PNGLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp @@ -9,8 +9,8 @@ #include #include #include -#include -#include +#include +#include #include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PNGLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PNGLoader.h similarity index 95% rename from Userland/Libraries/LibGfx/PNGLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/PNGLoader.h index 80abda9dafd..b8f7b6097f6 100644 --- a/Userland/Libraries/LibGfx/PNGLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PNGLoader.h @@ -6,7 +6,7 @@ #pragma once -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PNGShared.h b/Userland/Libraries/LibGfx/ImageFormats/PNGShared.h similarity index 100% rename from Userland/Libraries/LibGfx/PNGShared.h rename to Userland/Libraries/LibGfx/ImageFormats/PNGShared.h diff --git a/Userland/Libraries/LibGfx/PNGWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp similarity index 99% rename from Userland/Libraries/LibGfx/PNGWriter.cpp rename to Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp index 8bd39aff4e1..ad1c7afa513 100644 --- a/Userland/Libraries/LibGfx/PNGWriter.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #pragma GCC diagnostic ignored "-Wpsabi" diff --git a/Userland/Libraries/LibGfx/PNGWriter.h b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.h similarity index 96% rename from Userland/Libraries/LibGfx/PNGWriter.h rename to Userland/Libraries/LibGfx/ImageFormats/PNGWriter.h index 9a19e3b91b0..0891261ed29 100644 --- a/Userland/Libraries/LibGfx/PNGWriter.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PNGWriter.h @@ -10,7 +10,7 @@ #include #include #include -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PPMLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp similarity index 98% rename from Userland/Libraries/LibGfx/PPMLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp index 720cc7a5e7b..c662e76b876 100644 --- a/Userland/Libraries/LibGfx/PPMLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp @@ -7,11 +7,11 @@ #include "PPMLoader.h" #include "PortableImageLoaderCommon.h" -#include "Streamer.h" #include #include #include #include +#include #include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PPMLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.h similarity index 86% rename from Userland/Libraries/LibGfx/PPMLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/PPMLoader.h index 661b2a7c697..527bddbeae3 100644 --- a/Userland/Libraries/LibGfx/PPMLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PPMLoader.h @@ -8,8 +8,8 @@ #pragma once #include -#include -#include +#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PortableFormatWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.cpp similarity index 100% rename from Userland/Libraries/LibGfx/PortableFormatWriter.cpp rename to Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.cpp diff --git a/Userland/Libraries/LibGfx/PortableFormatWriter.h b/Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.h similarity index 100% rename from Userland/Libraries/LibGfx/PortableFormatWriter.h rename to Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.h diff --git a/Userland/Libraries/LibGfx/PortableImageLoaderCommon.h b/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h similarity index 99% rename from Userland/Libraries/LibGfx/PortableImageLoaderCommon.h rename to Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h index 5cfd1d29b25..a17b6c1921b 100644 --- a/Userland/Libraries/LibGfx/PortableImageLoaderCommon.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/PortableImageMapLoader.h b/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h similarity index 98% rename from Userland/Libraries/LibGfx/PortableImageMapLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h index e6be567dacd..9426bca36ec 100644 --- a/Userland/Libraries/LibGfx/PortableImageMapLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h @@ -11,7 +11,7 @@ #include #include #include -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/QOILoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp similarity index 99% rename from Userland/Libraries/LibGfx/QOILoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp index b6392ff65a8..fcebf42f795 100644 --- a/Userland/Libraries/LibGfx/QOILoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/QOILoader.h b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h similarity index 97% rename from Userland/Libraries/LibGfx/QOILoader.h rename to Userland/Libraries/LibGfx/ImageFormats/QOILoader.h index 65fa3738645..e072828018a 100644 --- a/Userland/Libraries/LibGfx/QOILoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/QOILoader.h @@ -8,7 +8,7 @@ #include #include -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/QOIWriter.cpp b/Userland/Libraries/LibGfx/ImageFormats/QOIWriter.cpp similarity index 100% rename from Userland/Libraries/LibGfx/QOIWriter.cpp rename to Userland/Libraries/LibGfx/ImageFormats/QOIWriter.cpp diff --git a/Userland/Libraries/LibGfx/QOIWriter.h b/Userland/Libraries/LibGfx/ImageFormats/QOIWriter.h similarity index 100% rename from Userland/Libraries/LibGfx/QOIWriter.h rename to Userland/Libraries/LibGfx/ImageFormats/QOIWriter.h diff --git a/Userland/Libraries/LibGfx/TGALoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp similarity index 99% rename from Userland/Libraries/LibGfx/TGALoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp index 067299454ae..0d5a8e1feae 100644 --- a/Userland/Libraries/LibGfx/TGALoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/TGALoader.h b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.h similarity index 95% rename from Userland/Libraries/LibGfx/TGALoader.h rename to Userland/Libraries/LibGfx/ImageFormats/TGALoader.h index b6a4b7bfdf8..70f2719aa17 100644 --- a/Userland/Libraries/LibGfx/TGALoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/TGALoader.h @@ -6,7 +6,7 @@ #pragma once -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibGfx/WebPLoader.cpp b/Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp similarity index 99% rename from Userland/Libraries/LibGfx/WebPLoader.cpp rename to Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp index d7a288d2fdc..3106e660889 100644 --- a/Userland/Libraries/LibGfx/WebPLoader.cpp +++ b/Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include // Overview: https://developers.google.com/speed/webp/docs/compression // Container: https://developers.google.com/speed/webp/docs/riff_container diff --git a/Userland/Libraries/LibGfx/WebPLoader.h b/Userland/Libraries/LibGfx/ImageFormats/WebPLoader.h similarity index 95% rename from Userland/Libraries/LibGfx/WebPLoader.h rename to Userland/Libraries/LibGfx/ImageFormats/WebPLoader.h index ddc82bd0f8e..f7f07a458c5 100644 --- a/Userland/Libraries/LibGfx/WebPLoader.h +++ b/Userland/Libraries/LibGfx/ImageFormats/WebPLoader.h @@ -6,7 +6,7 @@ #pragma once -#include +#include namespace Gfx { diff --git a/Userland/Libraries/LibPDF/Filter.cpp b/Userland/Libraries/LibPDF/Filter.cpp index 308c22d272b..f5aea252420 100644 --- a/Userland/Libraries/LibPDF/Filter.cpp +++ b/Userland/Libraries/LibPDF/Filter.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include diff --git a/Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp b/Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp index 4ee07569eab..b1f2810f376 100644 --- a/Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp +++ b/Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp index c1d5a207cda..a9bf71728eb 100644 --- a/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp +++ b/Userland/Libraries/LibWeb/Loader/FrameLoader.cpp @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Services/ImageDecoder/ConnectionFromClient.cpp b/Userland/Services/ImageDecoder/ConnectionFromClient.cpp index e1d25a589da..85c91024ed5 100644 --- a/Userland/Services/ImageDecoder/ConnectionFromClient.cpp +++ b/Userland/Services/ImageDecoder/ConnectionFromClient.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include namespace ImageDecoder { diff --git a/Userland/Services/SpiceAgent/SpiceAgent.cpp b/Userland/Services/SpiceAgent/SpiceAgent.cpp index 8dec42762b1..83292d8bc3f 100644 --- a/Userland/Services/SpiceAgent/SpiceAgent.cpp +++ b/Userland/Services/SpiceAgent/SpiceAgent.cpp @@ -7,11 +7,11 @@ #include "SpiceAgent.h" #include "ConnectionToClipboardServer.h" #include -#include #include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/Userland/Utilities/file.cpp b/Userland/Utilities/file.cpp index 067d20e81d5..a12240aedbd 100644 --- a/Userland/Utilities/file.cpp +++ b/Userland/Utilities/file.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Utilities/headless-browser.cpp b/Userland/Utilities/headless-browser.cpp index 975c257726e..3eb4376d7d4 100644 --- a/Userland/Utilities/headless-browser.cpp +++ b/Userland/Utilities/headless-browser.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/Userland/Utilities/icc.cpp b/Userland/Utilities/icc.cpp index ba85c844038..7cdc5e06d75 100644 --- a/Userland/Utilities/icc.cpp +++ b/Userland/Utilities/icc.cpp @@ -14,7 +14,7 @@ #include #include #include -#include +#include #include template diff --git a/Userland/Utilities/image.cpp b/Userland/Utilities/image.cpp index 74d3654ba32..2462f9e2c1c 100644 --- a/Userland/Utilities/image.cpp +++ b/Userland/Utilities/image.cpp @@ -7,11 +7,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include ErrorOr serenity_main(Main::Arguments arguments) { diff --git a/Userland/Utilities/shot.cpp b/Userland/Utilities/shot.cpp index c168f9d583a..bb0b8cddc56 100644 --- a/Userland/Utilities/shot.cpp +++ b/Userland/Utilities/shot.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include