RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 05:57:44 +00:00
Code Issues Activity Actions

LibGfx: Move TTF files from TrueTypeFont/ to Font/TrueType/

Browse source
This commit is contained in:
Simon Wanner 2022-04-09 08:52:59 +02:00 • committed by Andreas Kling
parent e84bbfed44
commit 6f8fd91f22
15 changed files with 36 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Meta/Lagom/CMakeLists.txt
View file

@ -340,11 +340,11 @@ if (BUILD_LAGOM)
# Gfx # Gfx
file(GLOB LIBGFX_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGfx/*.cpp") file(GLOB LIBGFX_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGfx/*.cpp")
file(GLOB LIBGFX_TTF_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGfx/TrueTypeFont/*.cpp") file(GLOB LIBGFX_TTF_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGfx/Font/TrueType/*.cpp")
lagom_lib(Gfx gfx lagom_lib(Gfx gfx
SOURCES ${LIBGFX_SOURCES} ${LIBGFX_TTF_SOURCES} SOURCES ${LIBGFX_SOURCES} ${LIBGFX_TTF_SOURCES}
LIBS m LagomCompress LagomTextCodec LagomIPC LIBS m LagomCompress LagomTextCodec LagomIPC
) )
# GPU # GPU
file(GLOB LIBGPU_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGPU/*.cpp") file(GLOB LIBGPU_SOURCES CONFIGURE_DEPENDS "../../Userland/Libraries/LibGPU/*.cpp")

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

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

2
Tests/LibTTF/TestCmap.cpp
View file

@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/TrueTypeFont/Cmap.h> #include <LibGfx/Font/TrueType/Cmap.h>
#include <LibTest/TestCase.h> #include <LibTest/TestCase.h>
TEST_CASE(test_cmap_format_4) TEST_CASE(test_cmap_format_4)

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

@ -29,22 +29,22 @@ set(SOURCES
PNGLoader.cpp PNGLoader.cpp
PNGWriter.cpp PNGWriter.cpp
PPMLoader.cpp PPMLoader.cpp
Point.cpp Point.cpp
QOILoader.cpp QOILoader.cpp
Rect.cpp Rect.cpp
ShareableBitmap.cpp ShareableBitmap.cpp
Size.cpp Size.cpp
StylePainter.cpp StylePainter.cpp
SystemTheme.cpp SystemTheme.cpp
TextDirection.cpp TextDirection.cpp
TextLayout.cpp TextLayout.cpp
Triangle.cpp Triangle.cpp
TrueTypeFont/Font.cpp Font/TrueType/Font.cpp
TrueTypeFont/Glyf.cpp Font/TrueType/Glyf.cpp
TrueTypeFont/Cmap.cpp Font/TrueType/Cmap.cpp
Typeface.cpp Typeface.cpp
WindowTheme.cpp WindowTheme.cpp
) )
serenity_lib(LibGfx gfx) serenity_lib(LibGfx gfx)
target_link_libraries(LibGfx LibM LibCompress LibCore LibTextCodec LibIPC) target_link_libraries(LibGfx LibM LibCompress LibCore LibTextCodec LibIPC)

2
Userland/Libraries/LibGfx/TrueTypeFont/Cmap.cpp → Userland/Libraries/LibGfx/Font/TrueType/Cmap.cpp
View file

@ -5,7 +5,7 @@
*/ */
#include <AK/Optional.h> #include <AK/Optional.h>
#include <LibGfx/TrueTypeFont/Cmap.h> #include <LibGfx/Font/TrueType/Cmap.h>
namespace TTF { namespace TTF {

0
Userland/Libraries/LibGfx/TrueTypeFont/Cmap.h → Userland/Libraries/LibGfx/Font/TrueType/Cmap.h
View file

8
Userland/Libraries/LibGfx/TrueTypeFont/Font.cpp → Userland/Libraries/LibGfx/Font/TrueType/Font.cpp
View file

@ -11,10 +11,10 @@
#include <AK/Utf32View.h> #include <AK/Utf32View.h>
#include <AK/Utf8View.h> #include <AK/Utf8View.h>
#include <LibCore/MappedFile.h> #include <LibCore/MappedFile.h>
#include <LibGfx/TrueTypeFont/Cmap.h> #include <LibGfx/Font/TrueType/Cmap.h>
#include <LibGfx/TrueTypeFont/Font.h> #include <LibGfx/Font/TrueType/Font.h>
#include <LibGfx/TrueTypeFont/Glyf.h> #include <LibGfx/Font/TrueType/Glyf.h>
#include <LibGfx/TrueTypeFont/Tables.h> #include <LibGfx/Font/TrueType/Tables.h>
#include <LibTextCodec/Decoder.h> #include <LibTextCodec/Decoder.h>
#include <math.h> #include <math.h>
#include <sys/mman.h> #include <sys/mman.h>

6
Userland/Libraries/LibGfx/TrueTypeFont/Font.h → Userland/Libraries/LibGfx/Font/TrueType/Font.h
View file

@ -13,9 +13,9 @@
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/Font.h> #include <LibGfx/Font.h>
#include <LibGfx/Size.h> #include <LibGfx/Size.h>
#include <LibGfx/TrueTypeFont/Cmap.h> #include <LibGfx/Font/TrueType/Cmap.h>
#include <LibGfx/TrueTypeFont/Glyf.h> #include <LibGfx/Font/TrueType/Glyf.h>
#include <LibGfx/TrueTypeFont/Tables.h> #include <LibGfx/Font/TrueType/Tables.h>
#define POINTS_PER_INCH 72.0f #define POINTS_PER_INCH 72.0f
#define DEFAULT_DPI 96 #define DEFAULT_DPI 96

2
Userland/Libraries/LibGfx/TrueTypeFont/Glyf.cpp → Userland/Libraries/LibGfx/Font/TrueType/Glyf.cpp
View file

@ -4,9 +4,9 @@
* SPDX-License-Identifier: BSD-2-Clause * SPDX-License-Identifier: BSD-2-Clause
*/ */
#include <LibGfx/Font/TrueType/Glyf.h>
#include <LibGfx/Path.h> #include <LibGfx/Path.h>
#include <LibGfx/Point.h> #include <LibGfx/Point.h>
#include <LibGfx/TrueTypeFont/Glyf.h>
namespace TTF { namespace TTF {

2
Userland/Libraries/LibGfx/TrueTypeFont/Glyf.h → Userland/Libraries/LibGfx/Font/TrueType/Glyf.h
View file

@ -10,7 +10,7 @@
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGfx/AffineTransform.h> #include <LibGfx/AffineTransform.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
#include <LibGfx/TrueTypeFont/Tables.h> #include <LibGfx/Font/TrueType/Tables.h>
#include <math.h> #include <math.h>
namespace TTF { namespace TTF {

0
Userland/Libraries/LibGfx/TrueTypeFont/Tables.h → Userland/Libraries/LibGfx/Font/TrueType/Tables.h
View file

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

@ -10,7 +10,7 @@
#include <LibCore/DirIterator.h> #include <LibCore/DirIterator.h>
#include <LibGfx/Font.h> #include <LibGfx/Font.h>
#include <LibGfx/FontDatabase.h> #include <LibGfx/FontDatabase.h>
#include <LibGfx/TrueTypeFont/Font.h> #include <LibGfx/Font/TrueType/Font.h>
#include <LibGfx/Typeface.h> #include <LibGfx/Typeface.h>
#include <stdlib.h> #include <stdlib.h>

2
Userland/Libraries/LibGfx/Typeface.h
View file

@ -12,7 +12,7 @@
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGfx/BitmapFont.h> #include <LibGfx/BitmapFont.h>
#include <LibGfx/Font.h> #include <LibGfx/Font.h>
#include <LibGfx/TrueTypeFont/Font.h> #include <LibGfx/Font/TrueType/Font.h>
namespace Gfx { namespace Gfx {

2
Userland/Libraries/LibPDF/Fonts/TrueTypeFont.h
View file

@ -6,7 +6,7 @@
#pragma once #pragma once
#include <LibGfx/TrueTypeFont/Font.h> #include <LibGfx/Font/TrueType/Font.h>
#include <LibPDF/Fonts/Type1Font.h> #include <LibPDF/Fonts/Type1Font.h>
namespace PDF { namespace PDF {

2
Userland/Libraries/LibWeb/CSS/StyleComputer.cpp
View file

@ -12,7 +12,7 @@
#include <LibGfx/Font.h> #include <LibGfx/Font.h>
#include <LibGfx/FontDatabase.h> #include <LibGfx/FontDatabase.h>
#include <LibGfx/FontStyleMapping.h> #include <LibGfx/FontStyleMapping.h>
#include <LibGfx/TrueTypeFont/Font.h> #include <LibGfx/Font/TrueType/Font.h>
#include <LibWeb/CSS/CSSFontFaceRule.h> #include <LibWeb/CSS/CSSFontFaceRule.h>
#include <LibWeb/CSS/CSSStyleRule.h> #include <LibWeb/CSS/CSSStyleRule.h>
#include <LibWeb/CSS/Parser/Parser.h> #include <LibWeb/CSS/Parser/Parser.h>