system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-07-22 02:26:11 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

LibGfx: Move all image loaders and writers to a subdirectory

Browse source
This commit is contained in:
Lucas CHOLLET 2023-03-21 14:58:06 -04:00 committed by Andreas Kling
parent 752f06f228
commit 496b7ffb2b
73 changed files with 129 additions and 129 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Ladybird/ImageCodecPluginLadybird.cpp
View file

@ -9,7 +9,7 @@
#include "ImageCodecPluginLadybird.h" #include "ImageCodecPluginLadybird.h"
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <QImage> #include <QImage>
namespace Ladybird { namespace Ladybird {

2
Ladybird/WebContentView.cpp
View file

@ -29,7 +29,7 @@
#include <LibCore/Timer.h> #include <LibCore/Timer.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/Font/FontDatabase.h> #include <LibGfx/Font/FontDatabase.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibGfx/Painter.h> #include <LibGfx/Painter.h>
#include <LibGfx/Palette.h> #include <LibGfx/Palette.h>
#include <LibGfx/Rect.h> #include <LibGfx/Rect.h>

2
Meta/Lagom/Fuzzers/FuzzBMPLoader.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/BMPLoader.h> #include <LibGfx/ImageFormats/BMPLoader.h>
#include <stdio.h> #include <stdio.h>
extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size) extern "C" int LLVMFuzzerTestOneInput(uint8_t const* data, size_t size)

2
Meta/Lagom/Fuzzers/FuzzGIFLoader.cpp
View file

@ -7,7 +7,7 @@
#include <AK/Debug.h> #include <AK/Debug.h>
#include <AK/DeprecatedString.h> #include <AK/DeprecatedString.h>
#include <AK/Format.h> #include <AK/Format.h>
#include <LibGfx/GIFLoader.h> #include <LibGfx/ImageFormats/GIFLoader.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
Meta/Lagom/Fuzzers/FuzzICOLoader.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/ICOLoader.h> #include <LibGfx/ImageFormats/ICOLoader.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
Meta/Lagom/Fuzzers/FuzzJPEGLoader.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/JPEGLoader.h> #include <LibGfx/ImageFormats/JPEGLoader.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
Meta/Lagom/Fuzzers/FuzzPBMLoader.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/PBMLoader.h> #include <LibGfx/ImageFormats/PBMLoader.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
Meta/Lagom/Fuzzers/FuzzPGMLoader.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/PGMLoader.h> #include <LibGfx/ImageFormats/PGMLoader.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
Meta/Lagom/Fuzzers/FuzzPNGLoader.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/PNGLoader.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
Meta/Lagom/Fuzzers/FuzzPPMLoader.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/PPMLoader.h> #include <LibGfx/ImageFormats/PPMLoader.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
Meta/Lagom/Fuzzers/FuzzQOILoader.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/QOILoader.h> #include <LibGfx/ImageFormats/QOILoader.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
Meta/Lagom/Fuzzers/FuzzTGALoader.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/TGALoader.h> #include <LibGfx/ImageFormats/TGALoader.h>
#include <stddef.h> #include <stddef.h>
#include <stdint.h> #include <stdint.h>

2
Tests/LibGL/TestRender.cpp
View file

@ -11,7 +11,7 @@
#include <LibGL/GL/gl.h> #include <LibGL/GL/gl.h>
#include <LibGL/GLContext.h> #include <LibGL/GLContext.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/QOIWriter.h> #include <LibGfx/ImageFormats/QOIWriter.h>
#include <LibTest/TestCase.h> #include <LibTest/TestCase.h>
#ifdef AK_OS_SERENITY #ifdef AK_OS_SERENITY

2
Tests/LibGL/TestShaders.cpp
View file

@ -9,7 +9,7 @@
#include <LibGL/GL/gl.h> #include <LibGL/GL/gl.h>
#include <LibGL/GLContext.h> #include <LibGL/GLContext.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/QOIWriter.h> #include <LibGfx/ImageFormats/QOIWriter.h>
#include <LibTest/TestCase.h> #include <LibTest/TestCase.h>
static NonnullOwnPtr<GL::GLContext> create_testing_context(int width, int height) static NonnullOwnPtr<GL::GLContext> create_testing_context(int width, int height)

6
Tests/LibGfx/TestICCProfile.cpp
View file

@ -9,9 +9,9 @@
#include <LibGfx/ICC/BinaryWriter.h> #include <LibGfx/ICC/BinaryWriter.h>
#include <LibGfx/ICC/Profile.h> #include <LibGfx/ICC/Profile.h>
#include <LibGfx/ICC/WellKnownProfiles.h> #include <LibGfx/ICC/WellKnownProfiles.h>
#include <LibGfx/JPEGLoader.h> #include <LibGfx/ImageFormats/JPEGLoader.h>
#include <LibGfx/PNGLoader.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <LibGfx/WebPLoader.h> #include <LibGfx/ImageFormats/WebPLoader.h>
#include <LibTest/TestCase.h> #include <LibTest/TestCase.h>
#ifdef AK_OS_SERENITY #ifdef AK_OS_SERENITY

22
Tests/LibGfx/TestImageDecoder.cpp
View file

@ -7,17 +7,17 @@
#include <AK/DeprecatedString.h> #include <AK/DeprecatedString.h>
#include <LibCore/MappedFile.h> #include <LibCore/MappedFile.h>
#include <LibGfx/BMPLoader.h> #include <LibGfx/ImageFormats/BMPLoader.h>
#include <LibGfx/GIFLoader.h> #include <LibGfx/ImageFormats/GIFLoader.h>
#include <LibGfx/ICOLoader.h> #include <LibGfx/ImageFormats/ICOLoader.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibGfx/JPEGLoader.h> #include <LibGfx/ImageFormats/JPEGLoader.h>
#include <LibGfx/PBMLoader.h> #include <LibGfx/ImageFormats/PBMLoader.h>
#include <LibGfx/PGMLoader.h> #include <LibGfx/ImageFormats/PGMLoader.h>
#include <LibGfx/PNGLoader.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <LibGfx/PPMLoader.h> #include <LibGfx/ImageFormats/PPMLoader.h>
#include <LibGfx/TGALoader.h> #include <LibGfx/ImageFormats/TGALoader.h>
#include <LibGfx/WebPLoader.h> #include <LibGfx/ImageFormats/WebPLoader.h>
#include <LibTest/TestCase.h> #include <LibTest/TestCase.h>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>

2
Userland/Applications/Browser/BrowserWindow.cpp
View file

@ -32,7 +32,7 @@
#include <LibGUI/TabWidget.h> #include <LibGUI/TabWidget.h>
#include <LibGUI/ToolbarContainer.h> #include <LibGUI/ToolbarContainer.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibJS/Interpreter.h> #include <LibJS/Interpreter.h>
#include <LibWeb/CSS/PreferredColorScheme.h> #include <LibWeb/CSS/PreferredColorScheme.h>
#include <LibWeb/Dump.h> #include <LibWeb/Dump.h>

6
Userland/Applications/Magnifier/main.cpp
View file

@ -18,10 +18,10 @@
#include <LibGUI/Menubar.h> #include <LibGUI/Menubar.h>
#include <LibGUI/MessageBox.h> #include <LibGUI/MessageBox.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/BMPWriter.h>
#include <LibGfx/Filters/ColorBlindnessFilter.h> #include <LibGfx/Filters/ColorBlindnessFilter.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/BMPWriter.h>
#include <LibGfx/QOIWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibGfx/ImageFormats/QOIWriter.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
static ErrorOr<ByteBuffer> dump_bitmap(RefPtr<Gfx::Bitmap> bitmap, AK::StringView extension) static ErrorOr<ByteBuffer> dump_bitmap(RefPtr<Gfx::Bitmap> bitmap, AK::StringView extension)

6
Userland/Applications/PixelPaint/Image.cpp
View file

@ -12,10 +12,10 @@
#include <AK/Base64.h> #include <AK/Base64.h>
#include <AK/JsonObject.h> #include <AK/JsonObject.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGfx/BMPWriter.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/BMPWriter.h>
#include <LibGfx/QOIWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibGfx/ImageFormats/QOIWriter.h>
#include <LibImageDecoderClient/Client.h> #include <LibImageDecoderClient/Client.h>
#include <stdio.h> #include <stdio.h>

6
Userland/Demos/Mandelbrot/Mandelbrot.cpp
View file

@ -16,10 +16,10 @@
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/BMPWriter.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/BMPWriter.h>
#include <LibGfx/QOIWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibGfx/ImageFormats/QOIWriter.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <unistd.h> #include <unistd.h>

2
Userland/Libraries/LibGUI/FileIconProvider.cpp
View file

@ -17,7 +17,7 @@
#include <LibGUI/Icon.h> #include <LibGUI/Icon.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/PNGLoader.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <string.h> #include <string.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>

2
Userland/Libraries/LibGUI/ImageWidget.cpp
View file

@ -10,7 +10,7 @@
#include <LibGUI/ImageWidget.h> #include <LibGUI/ImageWidget.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
REGISTER_WIDGET(GUI, ImageWidget) REGISTER_WIDGET(GUI, ImageWidget)

2
Userland/Libraries/LibGUI/ImageWidget.h
View file

@ -9,7 +9,7 @@
#include <LibCore/Timer.h> #include <LibCore/Timer.h>
#include <LibGUI/Frame.h> #include <LibGUI/Frame.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace GUI { namespace GUI {

2
Userland/Libraries/LibGfx/Bitmap.cpp
View file

@ -20,7 +20,7 @@
#include <LibCore/MimeData.h> #include <LibCore/MimeData.h>
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibGfx/ShareableBitmap.h> #include <LibGfx/ShareableBitmap.h>
#include <errno.h> #include <errno.h>
#include <fcntl.h> #include <fcntl.h>

34
Userland/Libraries/LibGfx/CMakeLists.txt
View file

@ -1,15 +1,12 @@
set(SOURCES set(SOURCES
AffineTransform.cpp AffineTransform.cpp
AntiAliasingPainter.cpp AntiAliasingPainter.cpp
BMPLoader.cpp
BMPWriter.cpp
Bitmap.cpp Bitmap.cpp
BitmapMixer.cpp BitmapMixer.cpp
ClassicStylePainter.cpp ClassicStylePainter.cpp
ClassicWindowTheme.cpp ClassicWindowTheme.cpp
Color.cpp Color.cpp
CursorParams.cpp CursorParams.cpp
DDSLoader.cpp
FillPathImplementation.cpp FillPathImplementation.cpp
Filters/ColorBlindnessFilter.cpp Filters/ColorBlindnessFilter.cpp
Filters/FastBoxBlurFilter.cpp Filters/FastBoxBlurFilter.cpp
@ -28,27 +25,32 @@ set(SOURCES
Font/Typeface.cpp Font/Typeface.cpp
Font/WOFF/Font.cpp Font/WOFF/Font.cpp
GradientPainting.cpp GradientPainting.cpp
GIFLoader.cpp
ICC/BinaryWriter.cpp ICC/BinaryWriter.cpp
ICC/Profile.cpp ICC/Profile.cpp
ICC/Tags.cpp ICC/Tags.cpp
ICC/TagTypes.cpp ICC/TagTypes.cpp
ICC/WellKnownProfiles.cpp ICC/WellKnownProfiles.cpp
ICOLoader.cpp ImageFormats/BMPLoader.cpp
ImageDecoder.cpp ImageFormats/BMPWriter.cpp
JPEGLoader.cpp ImageFormats/DDSLoader.cpp
PBMLoader.cpp ImageFormats/GIFLoader.cpp
PGMLoader.cpp ImageFormats/ICOLoader.cpp
PNGLoader.cpp ImageFormats/ImageDecoder.cpp
PNGWriter.cpp ImageFormats/JPEGLoader.cpp
PortableFormatWriter.cpp ImageFormats/PBMLoader.cpp
PPMLoader.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 Painter.cpp
Palette.cpp Palette.cpp
Path.cpp Path.cpp
Point.cpp Point.cpp
QOILoader.cpp
QOIWriter.cpp
Rect.cpp Rect.cpp
ShareableBitmap.cpp ShareableBitmap.cpp
Size.cpp Size.cpp
@ -56,9 +58,7 @@ set(SOURCES
SystemTheme.cpp SystemTheme.cpp
TextDirection.cpp TextDirection.cpp
TextLayout.cpp TextLayout.cpp
TGALoader.cpp
Triangle.cpp Triangle.cpp
WebPLoader.cpp
WindowTheme.cpp WindowTheme.cpp
) )

2
Userland/Libraries/LibGfx/Font/OpenType/Font.cpp
View file

@ -17,7 +17,7 @@
#include <LibGfx/Font/OpenType/Font.h> #include <LibGfx/Font/OpenType/Font.h>
#include <LibGfx/Font/OpenType/Glyf.h> #include <LibGfx/Font/OpenType/Glyf.h>
#include <LibGfx/Font/OpenType/Tables.h> #include <LibGfx/Font/OpenType/Tables.h>
#include <LibGfx/PNGLoader.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <LibTextCodec/Decoder.h> #include <LibTextCodec/Decoder.h>
#include <math.h> #include <math.h>
#include <sys/mman.h> #include <sys/mman.h>

2
Userland/Libraries/LibGfx/BMPLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/BMPLoader.cpp
View file

@ -12,7 +12,7 @@
#include <AK/Function.h> #include <AK/Function.h>
#include <AK/Try.h> #include <AK/Try.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGfx/BMPLoader.h> #include <LibGfx/ImageFormats/BMPLoader.h>
namespace Gfx { namespace Gfx {

4
Userland/Libraries/LibGfx/BMPLoader.h → Userland/Libraries/LibGfx/ImageFormats/BMPLoader.h
View file

@ -6,8 +6,8 @@
#pragma once #pragma once
#include <LibGfx/ICOLoader.h> #include <LibGfx/ImageFormats/ICOLoader.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/BMPWriter.cpp → Userland/Libraries/LibGfx/ImageFormats/BMPWriter.cpp
View file

@ -4,8 +4,8 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/BMPWriter.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/ImageFormats/BMPWriter.h>
namespace Gfx { namespace Gfx {

0
Userland/Libraries/LibGfx/BMPWriter.h → Userland/Libraries/LibGfx/ImageFormats/BMPWriter.h
View file

2
Userland/Libraries/LibGfx/DDSLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/DDSLoader.cpp
View file

@ -12,7 +12,7 @@
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <AK/Try.h> #include <AK/Try.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGfx/DDSLoader.h> #include <LibGfx/ImageFormats/DDSLoader.h>
#include <fcntl.h> #include <fcntl.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>

2
Userland/Libraries/LibGfx/DDSLoader.h → Userland/Libraries/LibGfx/ImageFormats/DDSLoader.h
View file

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/GIFLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/GIFLoader.cpp
View file

@ -13,7 +13,7 @@
#include <AK/Memory.h> #include <AK/Memory.h>
#include <AK/MemoryStream.h> #include <AK/MemoryStream.h>
#include <AK/Try.h> #include <AK/Try.h>
#include <LibGfx/GIFLoader.h> #include <LibGfx/ImageFormats/GIFLoader.h>
#include <string.h> #include <string.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/GIFLoader.h → Userland/Libraries/LibGfx/ImageFormats/GIFLoader.h
View file

@ -7,7 +7,7 @@
#pragma once #pragma once
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace Gfx { namespace Gfx {

6
Userland/Libraries/LibGfx/ICOLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/ICOLoader.cpp
View file

@ -8,9 +8,9 @@
#include <AK/Debug.h> #include <AK/Debug.h>
#include <AK/MemoryStream.h> #include <AK/MemoryStream.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <LibGfx/BMPLoader.h> #include <LibGfx/ImageFormats/BMPLoader.h>
#include <LibGfx/ICOLoader.h> #include <LibGfx/ImageFormats/ICOLoader.h>
#include <LibGfx/PNGLoader.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <string.h> #include <string.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/ICOLoader.h → Userland/Libraries/LibGfx/ImageFormats/ICOLoader.h
View file

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace Gfx { namespace Gfx {

26
Userland/Libraries/LibGfx/ImageDecoder.cpp → Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.cpp
View file

@ -5,19 +5,19 @@
*/ */
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <LibGfx/BMPLoader.h> #include <LibGfx/ImageFormats/BMPLoader.h>
#include <LibGfx/DDSLoader.h> #include <LibGfx/ImageFormats/DDSLoader.h>
#include <LibGfx/GIFLoader.h> #include <LibGfx/ImageFormats/GIFLoader.h>
#include <LibGfx/ICOLoader.h> #include <LibGfx/ImageFormats/ICOLoader.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibGfx/JPEGLoader.h> #include <LibGfx/ImageFormats/JPEGLoader.h>
#include <LibGfx/PBMLoader.h> #include <LibGfx/ImageFormats/PBMLoader.h>
#include <LibGfx/PGMLoader.h> #include <LibGfx/ImageFormats/PGMLoader.h>
#include <LibGfx/PNGLoader.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <LibGfx/PPMLoader.h> #include <LibGfx/ImageFormats/PPMLoader.h>
#include <LibGfx/QOILoader.h> #include <LibGfx/ImageFormats/QOILoader.h>
#include <LibGfx/TGALoader.h> #include <LibGfx/ImageFormats/TGALoader.h>
#include <LibGfx/WebPLoader.h> #include <LibGfx/ImageFormats/WebPLoader.h>
namespace Gfx { namespace Gfx {

0
Userland/Libraries/LibGfx/ImageDecoder.h → Userland/Libraries/LibGfx/ImageFormats/ImageDecoder.h
View file

2
Userland/Libraries/LibGfx/JPEGLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.cpp
View file

@ -14,7 +14,7 @@
#include <AK/String.h> #include <AK/String.h>
#include <AK/Try.h> #include <AK/Try.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGfx/JPEGLoader.h> #include <LibGfx/ImageFormats/JPEGLoader.h>
#define JPEG_INVALID 0X0000 #define JPEG_INVALID 0X0000

2
Userland/Libraries/LibGfx/JPEGLoader.h → Userland/Libraries/LibGfx/ImageFormats/JPEGLoader.h
View file

@ -7,7 +7,7 @@
#pragma once #pragma once
#include <AK/MemoryStream.h> #include <AK/MemoryStream.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace Gfx { namespace Gfx {

4
Userland/Libraries/LibGfx/PBMLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/PBMLoader.cpp
View file

@ -6,9 +6,9 @@
*/ */
#include "PBMLoader.h" #include "PBMLoader.h"
#include "AK/Endian.h"
#include "PortableImageLoaderCommon.h" #include "PortableImageLoaderCommon.h"
#include "Streamer.h" #include "Userland/Libraries/LibGfx/Streamer.h"
#include <AK/Endian.h>
#include <string.h> #include <string.h>
namespace Gfx { namespace Gfx {

4
Userland/Libraries/LibGfx/PBMLoader.h → Userland/Libraries/LibGfx/ImageFormats/PBMLoader.h
View file

@ -8,8 +8,8 @@
#pragma once #pragma once
#include <AK/StringView.h> #include <AK/StringView.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibGfx/PortableImageMapLoader.h> #include <LibGfx/ImageFormats/PortableImageMapLoader.h>
namespace Gfx { namespace Gfx {

6
Userland/Libraries/LibGfx/PGMLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/PGMLoader.cpp
View file

@ -5,10 +5,10 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include "PGMLoader.h"
#include "PortableImageLoaderCommon.h"
#include "Streamer.h"
#include <AK/Endian.h> #include <AK/Endian.h>
#include <LibGfx/ImageFormats/PGMLoader.h>
#include <LibGfx/ImageFormats/PortableImageLoaderCommon.h>
#include <LibGfx/Streamer.h>
#include <string.h> #include <string.h>
namespace Gfx { namespace Gfx {

4
Userland/Libraries/LibGfx/PGMLoader.h → Userland/Libraries/LibGfx/ImageFormats/PGMLoader.h
View file

@ -8,8 +8,8 @@
#pragma once #pragma once
#include <AK/StringView.h> #include <AK/StringView.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibGfx/PortableImageMapLoader.h> #include <LibGfx/ImageFormats/PortableImageMapLoader.h>
namespace Gfx { namespace Gfx {

4
Userland/Libraries/LibGfx/PNGLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/PNGLoader.cpp
View file

@ -9,8 +9,8 @@
#include <AK/Endian.h> #include <AK/Endian.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibCompress/Zlib.h> #include <LibCompress/Zlib.h>
#include <LibGfx/PNGLoader.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <LibGfx/PNGShared.h> #include <LibGfx/ImageFormats/PNGShared.h>
#include <string.h> #include <string.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/PNGLoader.h → Userland/Libraries/LibGfx/ImageFormats/PNGLoader.h
View file

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace Gfx { namespace Gfx {

0
Userland/Libraries/LibGfx/PNGShared.h → Userland/Libraries/LibGfx/ImageFormats/PNGShared.h
View file

2
Userland/Libraries/LibGfx/PNGWriter.cpp → Userland/Libraries/LibGfx/ImageFormats/PNGWriter.cpp
View file

@ -13,7 +13,7 @@
#include <LibCompress/Zlib.h> #include <LibCompress/Zlib.h>
#include <LibCrypto/Checksum/CRC32.h> #include <LibCrypto/Checksum/CRC32.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#pragma GCC diagnostic ignored "-Wpsabi" #pragma GCC diagnostic ignored "-Wpsabi"

2
Userland/Libraries/LibGfx/PNGWriter.h → Userland/Libraries/LibGfx/ImageFormats/PNGWriter.h
View file

@ -10,7 +10,7 @@
#include <AK/Optional.h> #include <AK/Optional.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGfx/Forward.h> #include <LibGfx/Forward.h>
#include <LibGfx/PNGShared.h> #include <LibGfx/ImageFormats/PNGShared.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/PPMLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/PPMLoader.cpp
View file

@ -7,11 +7,11 @@
#include "PPMLoader.h" #include "PPMLoader.h"
#include "PortableImageLoaderCommon.h" #include "PortableImageLoaderCommon.h"
#include "Streamer.h"
#include <AK/Endian.h> #include <AK/Endian.h>
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <AK/ScopeGuard.h> #include <AK/ScopeGuard.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibGfx/Streamer.h>
#include <string.h> #include <string.h>
namespace Gfx { namespace Gfx {

4
Userland/Libraries/LibGfx/PPMLoader.h → Userland/Libraries/LibGfx/ImageFormats/PPMLoader.h
View file

@ -8,8 +8,8 @@
#pragma once #pragma once
#include <AK/StringView.h> #include <AK/StringView.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibGfx/PortableImageMapLoader.h> #include <LibGfx/ImageFormats/PortableImageMapLoader.h>
namespace Gfx { namespace Gfx {

0
Userland/Libraries/LibGfx/PortableFormatWriter.cpp → Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.cpp
View file

0
Userland/Libraries/LibGfx/PortableFormatWriter.h → Userland/Libraries/LibGfx/ImageFormats/PortableFormatWriter.h
View file

2
Userland/Libraries/LibGfx/PortableImageLoaderCommon.h → Userland/Libraries/LibGfx/ImageFormats/PortableImageLoaderCommon.h
View file

@ -16,7 +16,7 @@
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/Color.h> #include <LibGfx/Color.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibGfx/Streamer.h> #include <LibGfx/Streamer.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/PortableImageMapLoader.h → Userland/Libraries/LibGfx/ImageFormats/PortableImageMapLoader.h
View file

@ -11,7 +11,7 @@
#include <AK/StringView.h> #include <AK/StringView.h>
#include <AK/Types.h> #include <AK/Types.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/PortableImageLoaderCommon.h> #include <LibGfx/ImageFormats/PortableImageLoaderCommon.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/QOILoader.cpp → Userland/Libraries/LibGfx/ImageFormats/QOILoader.cpp
View file

@ -7,7 +7,7 @@
#include <AK/Endian.h> #include <AK/Endian.h>
#include <AK/MemoryStream.h> #include <AK/MemoryStream.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/QOILoader.h> #include <LibGfx/ImageFormats/QOILoader.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/QOILoader.h → Userland/Libraries/LibGfx/ImageFormats/QOILoader.h
View file

@ -8,7 +8,7 @@
#include <AK/Forward.h> #include <AK/Forward.h>
#include <LibGfx/Forward.h> #include <LibGfx/Forward.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace Gfx { namespace Gfx {

0
Userland/Libraries/LibGfx/QOIWriter.cpp → Userland/Libraries/LibGfx/ImageFormats/QOIWriter.cpp
View file

0
Userland/Libraries/LibGfx/QOIWriter.h → Userland/Libraries/LibGfx/ImageFormats/QOIWriter.h
View file

2
Userland/Libraries/LibGfx/TGALoader.cpp → Userland/Libraries/LibGfx/ImageFormats/TGALoader.cpp
View file

@ -7,7 +7,7 @@
#include <AK/Span.h> #include <AK/Span.h>
#include <AK/StdLibExtraDetails.h> #include <AK/StdLibExtraDetails.h>
#include <AK/String.h> #include <AK/String.h>
#include <LibGfx/TGALoader.h> #include <LibGfx/ImageFormats/TGALoader.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/TGALoader.h → Userland/Libraries/LibGfx/ImageFormats/TGALoader.h
View file

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibGfx/WebPLoader.cpp → Userland/Libraries/LibGfx/ImageFormats/WebPLoader.cpp
View file

@ -8,7 +8,7 @@
#include <AK/Endian.h> #include <AK/Endian.h>
#include <AK/Format.h> #include <AK/Format.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGfx/WebPLoader.h> #include <LibGfx/ImageFormats/WebPLoader.h>
// Overview: https://developers.google.com/speed/webp/docs/compression // Overview: https://developers.google.com/speed/webp/docs/compression
// Container: https://developers.google.com/speed/webp/docs/riff_container // Container: https://developers.google.com/speed/webp/docs/riff_container

2
Userland/Libraries/LibGfx/WebPLoader.h → Userland/Libraries/LibGfx/ImageFormats/WebPLoader.h
View file

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibPDF/Filter.cpp
View file

@ -6,7 +6,7 @@
#include <AK/Hex.h> #include <AK/Hex.h>
#include <LibCompress/Deflate.h> #include <LibCompress/Deflate.h>
#include <LibGfx/JPEGLoader.h> #include <LibGfx/ImageFormats/JPEGLoader.h>
#include <LibPDF/CommonNames.h> #include <LibPDF/CommonNames.h>
#include <LibPDF/Filter.h> #include <LibPDF/Filter.h>

2
Userland/Libraries/LibWeb/HTML/HTMLCanvasElement.cpp
View file

@ -7,7 +7,7 @@
#include <AK/Base64.h> #include <AK/Base64.h>
#include <AK/Checked.h> #include <AK/Checked.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibWeb/CSS/StyleComputer.h> #include <LibWeb/CSS/StyleComputer.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>
#include <LibWeb/HTML/CanvasRenderingContext2D.h> #include <LibWeb/HTML/CanvasRenderingContext2D.h>

2
Userland/Libraries/LibWeb/Loader/FrameLoader.cpp
View file

@ -9,7 +9,7 @@
#include <AK/LexicalPath.h> #include <AK/LexicalPath.h>
#include <AK/SourceGenerator.h> #include <AK/SourceGenerator.h>
#include <LibGemini/Document.h> #include <LibGemini/Document.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibMarkdown/Document.h> #include <LibMarkdown/Document.h>
#include <LibWeb/Bindings/MainThreadVM.h> #include <LibWeb/Bindings/MainThreadVM.h>
#include <LibWeb/DOM/Document.h> #include <LibWeb/DOM/Document.h>

2
Userland/Services/ImageDecoder/ConnectionFromClient.cpp
View file

@ -8,7 +8,7 @@
#include <ImageDecoder/ConnectionFromClient.h> #include <ImageDecoder/ConnectionFromClient.h>
#include <ImageDecoder/ImageDecoderClientEndpoint.h> #include <ImageDecoder/ImageDecoderClientEndpoint.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
namespace ImageDecoder { namespace ImageDecoder {

8
Userland/Services/SpiceAgent/SpiceAgent.cpp
View file

@ -7,11 +7,11 @@
#include "SpiceAgent.h" #include "SpiceAgent.h"
#include "ConnectionToClipboardServer.h" #include "ConnectionToClipboardServer.h"
#include <AK/DeprecatedString.h> #include <AK/DeprecatedString.h>
#include <LibGfx/BMPLoader.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/JPEGLoader.h> #include <LibGfx/ImageFormats/BMPLoader.h>
#include <LibGfx/PNGLoader.h> #include <LibGfx/ImageFormats/JPEGLoader.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/PNGLoader.h>
#include <LibGfx/ImageFormats/PNGWriter.h>
#include <memory.h> #include <memory.h>
#include <unistd.h> #include <unistd.h>

2
Userland/Utilities/file.cpp
View file

@ -14,7 +14,7 @@
#include <LibCore/System.h> #include <LibCore/System.h>
#include <LibELF/Image.h> #include <LibELF/Image.h>
#include <LibELF/Validation.h> #include <LibELF/Validation.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <stdio.h> #include <stdio.h>
#include <sys/stat.h> #include <sys/stat.h>

2
Userland/Utilities/headless-browser.cpp
View file

@ -27,7 +27,7 @@
#include <LibFileSystem/FileSystem.h> #include <LibFileSystem/FileSystem.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/Font/FontDatabase.h> #include <LibGfx/Font/FontDatabase.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibGfx/Point.h> #include <LibGfx/Point.h>
#include <LibGfx/Rect.h> #include <LibGfx/Rect.h>
#include <LibGfx/ShareableBitmap.h> #include <LibGfx/ShareableBitmap.h>

2
Userland/Utilities/icc.cpp
View file

@ -14,7 +14,7 @@
#include <LibGfx/ICC/Profile.h> #include <LibGfx/ICC/Profile.h>
#include <LibGfx/ICC/Tags.h> #include <LibGfx/ICC/Tags.h>
#include <LibGfx/ICC/WellKnownProfiles.h> #include <LibGfx/ICC/WellKnownProfiles.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibVideo/Color/CodingIndependentCodePoints.h> #include <LibVideo/Color/CodingIndependentCodePoints.h>
template<class T> template<class T>

10
Userland/Utilities/image.cpp
View file

@ -7,11 +7,11 @@
#include <LibCore/ArgsParser.h> #include <LibCore/ArgsParser.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/MappedFile.h> #include <LibCore/MappedFile.h>
#include <LibGfx/BMPWriter.h> #include <LibGfx/ImageFormats/BMPWriter.h>
#include <LibGfx/ImageDecoder.h> #include <LibGfx/ImageFormats/ImageDecoder.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibGfx/PortableFormatWriter.h> #include <LibGfx/ImageFormats/PortableFormatWriter.h>
#include <LibGfx/QOIWriter.h> #include <LibGfx/ImageFormats/QOIWriter.h>
ErrorOr<int> serenity_main(Main::Arguments arguments) ErrorOr<int> serenity_main(Main::Arguments arguments)
{ {

2
Userland/Utilities/shot.cpp
View file

@ -19,7 +19,7 @@
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGUI/Widget.h> #include <LibGUI/Widget.h>
#include <LibGUI/Window.h> #include <LibGUI/Window.h>
#include <LibGfx/PNGWriter.h> #include <LibGfx/ImageFormats/PNGWriter.h>
#include <LibGfx/Palette.h> #include <LibGfx/Palette.h>
#include <LibMain/Main.h> #include <LibMain/Main.h>
#include <unistd.h> #include <unistd.h>