From 5cfaf9881dc5808c9229acfcbe2de81848ee817c Mon Sep 17 00:00:00 2001 From: Bart Beumer Date: Sat, 16 Aug 2025 20:28:50 +0000 Subject: [PATCH] Correct formatting of files. --- .devcontainer/Dockerfile | 4 +- .devcontainer/devcontainer.json | 1 - .../include/bmrshared/freetype_face.hpp | 65 +++++++++---------- .../include/bmrshared/freetype_lib.hpp | 22 +++---- .../include/bmrshared/freetype_utils.hpp | 20 +++--- bmrshared-freetype/lib/freetype_face.cpp | 42 ++++-------- bmrshared-freetype/lib/freetype_utils.cpp | 20 +++--- bmrshared-magic/tst/test_magic.cpp | 2 +- .../include/bmrshared/function_wrapper.hpp | 4 +- bmrshared/include/bmrshared/invoke.hpp | 12 ++-- 10 files changed, 88 insertions(+), 104 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 83985d5..796c970 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -5,15 +5,15 @@ RUN apk update && \ apk add --no-cache \ autoconf \ bash \ - boost-build \ build-base \ cmake \ + clang \ + clang-extra-tools \ gdb \ git \ libstdc++ \ libtool \ linux-headers \ - ninja \ m4 \ perl \ python3 \ diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 99cdf95..1e64a64 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -3,7 +3,6 @@ "build": { "dockerfile": "Dockerfile" }, - // Configure tool-specific properties. "customizations": { "vscode": { diff --git a/bmrshared-freetype/include/bmrshared/freetype_face.hpp b/bmrshared-freetype/include/bmrshared/freetype_face.hpp index 71c40f2..56dc082 100644 --- a/bmrshared-freetype/include/bmrshared/freetype_face.hpp +++ b/bmrshared-freetype/include/bmrshared/freetype_face.hpp @@ -7,51 +7,44 @@ // #pragma once -#include -#include -#include - #include #include +#include +#include +#include #include FT_FREETYPE_H #include FT_BITMAP_H namespace bmrshared { - class freetype_lib; +class freetype_lib; - class freetype_face final : public std::enable_shared_from_this - { - using character_index = FT_ULong; - using pixel_size = FT_UInt; +class freetype_face final : public std::enable_shared_from_this +{ + using character_index = FT_ULong; + using pixel_size = FT_UInt; - public: - freetype_face(std::shared_ptr lib, - const std::string& font_path, - pixel_size pixel_width, - pixel_size pixel_height, - bool render_monochrome - ); + public: + freetype_face(std::shared_ptr lib, + const std::string& font_path, + pixel_size pixel_width, + pixel_size pixel_height, + bool render_monochrome); - ~freetype_face(); + ~freetype_face(); - FT_BBox get_boundbox() const; - FT_Glyph_Metrics get_dimensions(character_index character_index) const; + FT_BBox get_boundbox() const; + FT_Glyph_Metrics get_dimensions(character_index character_index) const; - void render( - character_index character_index, - std::function painter); - -private: - FT_Int32 get_load_flags() const; - FT_Render_Mode get_render_mode() const; - - private: - std::shared_ptr m_lib; - FT_Face m_face; - bool m_renderMonochrome; - }; -} + void render(character_index character_index, std::function painter); + + private: + FT_Int32 get_load_flags() const; + FT_Render_Mode get_render_mode() const; + + private: + std::shared_ptr m_lib; + FT_Face m_face; + bool m_renderMonochrome; +}; +} // namespace bmrshared diff --git a/bmrshared-freetype/include/bmrshared/freetype_lib.hpp b/bmrshared-freetype/include/bmrshared/freetype_lib.hpp index 1612274..531d50a 100644 --- a/bmrshared-freetype/include/bmrshared/freetype_lib.hpp +++ b/bmrshared-freetype/include/bmrshared/freetype_lib.hpp @@ -6,21 +6,21 @@ // the Free Software Foundation. // #pragma once -#include #include +#include #include FT_FREETYPE_H namespace bmrshared { - class freetype_lib final : public std::enable_shared_from_this - { - public: - freetype_lib(); - ~freetype_lib(); +class freetype_lib final : public std::enable_shared_from_this +{ + public: + freetype_lib(); + ~freetype_lib(); - FT_Library get_ft_library(); + FT_Library get_ft_library(); - private: - FT_Library m_library; - }; -} + private: + FT_Library m_library; +}; +} // namespace bmrshared diff --git a/bmrshared-freetype/include/bmrshared/freetype_utils.hpp b/bmrshared-freetype/include/bmrshared/freetype_utils.hpp index ed481ae..276ce93 100644 --- a/bmrshared-freetype/include/bmrshared/freetype_utils.hpp +++ b/bmrshared-freetype/include/bmrshared/freetype_utils.hpp @@ -11,13 +11,15 @@ namespace bmrshared { - struct dimensions final - { - FT_Pos width; - FT_Pos height; - FT_Pos vertOriginOffsetY; - }; +struct dimensions final +{ + FT_Pos width; + FT_Pos height; + FT_Pos vertOriginOffsetY; +}; - dimensions freetype_calculate_dimensions(freetype_face& face, std::string_view text); - void freetype_paint(freetype_face& face, std::string_view text, const std::function& paintfn); -} \ No newline at end of file +dimensions freetype_calculate_dimensions(freetype_face& face, std::string_view text); +void freetype_paint(freetype_face& face, + std::string_view text, + const std::function& paintfn); +} // namespace bmrshared \ No newline at end of file diff --git a/bmrshared-freetype/lib/freetype_face.cpp b/bmrshared-freetype/lib/freetype_face.cpp index 0bf10d4..e4ac8b2 100644 --- a/bmrshared-freetype/lib/freetype_face.cpp +++ b/bmrshared-freetype/lib/freetype_face.cpp @@ -5,31 +5,23 @@ // under the terms of the GNU Lesser General Public License v3.0 as published by // the Free Software Foundation. // +#include #include #include -#include using namespace bmrshared; -freetype_face::freetype_face( - std::shared_ptr lib, - const std::string& font_path, - pixel_size pixel_width, - pixel_size pixel_height, - bool render_monochrome) +freetype_face::freetype_face(std::shared_ptr lib, + const std::string& font_path, + pixel_size pixel_width, + pixel_size pixel_height, + bool render_monochrome) : m_lib(lib) , m_renderMonochrome(render_monochrome) { - FT_New_Face( - m_lib->get_ft_library(), - font_path.c_str(), - 0, - &m_face); + FT_New_Face(m_lib->get_ft_library(), font_path.c_str(), 0, &m_face); - FT_Set_Pixel_Sizes( - m_face, - pixel_width, - pixel_height); + FT_Set_Pixel_Sizes(m_face, pixel_width, pixel_height); } freetype_face::~freetype_face() @@ -42,24 +34,18 @@ FT_BBox freetype_face::get_boundbox() const return m_face->bbox; } -FT_Glyph_Metrics freetype_face::get_dimensions( - character_index character_index) const +FT_Glyph_Metrics freetype_face::get_dimensions(character_index character_index) const { // Load glyph and retrieve metrics. const auto glyph_index = FT_Get_Char_Index(m_face, character_index); FT_Load_Glyph(m_face, glyph_index, get_load_flags()); - + FT_GlyphSlot& glyphSlot = m_face->glyph; return glyphSlot->metrics; } -void freetype_face::render( - FT_ULong character_index, - std::function painter) +void freetype_face::render(FT_ULong character_index, std::function painter) { // Load glyph and retrieve metrics. const auto glyph_index = FT_Get_Char_Index(m_face, character_index); @@ -74,12 +60,12 @@ void freetype_face::render( FT_Bitmap_Init(&target); FT_Bitmap_Convert(m_lib->get_ft_library(), &bitmap, &target, 1); - for(unsigned int x = 0; x < target.width; ++x) + for (unsigned int x = 0; x < target.width; ++x) { - for(unsigned int y = 0; y < target.rows; ++y) + for (unsigned int y = 0; y < target.rows; ++y) { const uint8_t& value = 0xff * target.buffer[x + target.width * y]; - painter(x,y,value); + painter(x, y, value); } } diff --git a/bmrshared-freetype/lib/freetype_utils.cpp b/bmrshared-freetype/lib/freetype_utils.cpp index de8bf6f..4bfe51d 100644 --- a/bmrshared-freetype/lib/freetype_utils.cpp +++ b/bmrshared-freetype/lib/freetype_utils.cpp @@ -5,8 +5,8 @@ // under the terms of the GNU Lesser General Public License v3.0 as published by // the Free Software Foundation. // -#include #include +#include #include namespace bmrshared @@ -21,7 +21,7 @@ dimensions freetype_calculate_dimensions(freetype_face& face, std::string_view t for (const char& c : text) { const FT_Glyph_Metrics& dim = face.get_dimensions(c); - + line_width += dim.horiAdvance; const auto char_above_origin = dim.horiBearingY; const auto char_below_origin = dim.height - dim.horiBearingY; @@ -29,10 +29,14 @@ dimensions freetype_calculate_dimensions(freetype_face& face, std::string_view t line_above_origin = std::max(line_above_origin, char_above_origin); line_below_origin = std::max(line_below_origin, char_below_origin); } - return {.width = line_width, .height = (line_above_origin + line_below_origin), .vertOriginOffsetY = line_above_origin}; + return {.width = line_width, + .height = (line_above_origin + line_below_origin), + .vertOriginOffsetY = line_above_origin}; } -void freetype_paint(freetype_face& face, std::string_view text, const std::function& paintfn) +void freetype_paint(freetype_face& face, + std::string_view text, + const std::function& paintfn) { FT_Pos line_x = 0; FT_Pos char_offset_x = 0; @@ -42,15 +46,15 @@ void freetype_paint(freetype_face& face, std::string_view text, const std::funct paintfn((char_offset_x + x), (y - char_offset_y), level); }; - for( const char& c : text) + for (const char& c : text) { const FT_Glyph_Metrics& dim = face.get_dimensions(c); - char_offset_x = (line_x + (dim.horiAdvance - dim.width)/2)/64; - char_offset_y = dim.horiBearingY/64; + char_offset_x = (line_x + (dim.horiAdvance - dim.width) / 2) / 64; + char_offset_y = dim.horiBearingY / 64; face.render(c, painter_char); line_x += dim.horiAdvance; } } -} \ No newline at end of file +} // namespace bmrshared \ No newline at end of file diff --git a/bmrshared-magic/tst/test_magic.cpp b/bmrshared-magic/tst/test_magic.cpp index b4ce5c2..3530985 100644 --- a/bmrshared-magic/tst/test_magic.cpp +++ b/bmrshared-magic/tst/test_magic.cpp @@ -10,7 +10,7 @@ namespace { - constexpr std::string_view magic_file_location = "/usr/local/bin/magic.mgc"; +constexpr std::string_view magic_file_location = "/usr/local/bin/magic.mgc"; } TEST(test_magic, no_throw_on_query) diff --git a/bmrshared/include/bmrshared/function_wrapper.hpp b/bmrshared/include/bmrshared/function_wrapper.hpp index ceaabdf..91347e3 100644 --- a/bmrshared/include/bmrshared/function_wrapper.hpp +++ b/bmrshared/include/bmrshared/function_wrapper.hpp @@ -29,7 +29,7 @@ struct function_wrapper using wrapper_type = std::function; template - static wrapper_type Wrap(M T::*callableFn, TSourceParams... paramNames) + static wrapper_type Wrap(M T::* callableFn, TSourceParams... paramNames) { std::array names{paramNames...}; return [callableFn, names](const T& obj, const IDataSource& source, TExtraArguments... args) @@ -47,7 +47,7 @@ struct function_wrapper using wrapper_type = std::function; template - static wrapper_type Wrap(M T::*callableFn, TSourceParams... paramNames) + static wrapper_type Wrap(M T::* callableFn, TSourceParams... paramNames) { std::array names{paramNames...}; return [callableFn, names](T& obj, const IDataSource& source, TExtraArguments... args) diff --git a/bmrshared/include/bmrshared/invoke.hpp b/bmrshared/include/bmrshared/invoke.hpp index 86d4fb6..6c2a867 100644 --- a/bmrshared/include/bmrshared/invoke.hpp +++ b/bmrshared/include/bmrshared/invoke.hpp @@ -29,9 +29,9 @@ namespace detail }; template - requires(NTypesToKeep > 0) + requires(NTypesToKeep > 0) - struct tuple_keepelemsfront, NTypesToKeep, TypesToKeep...> + struct tuple_keepelemsfront, NTypesToKeep, TypesToKeep...> { using tuple = typename tuple_keepelemsfront, (NTypesToKeep - 1), @@ -52,10 +52,10 @@ namespace detail } // namespace detail template -requires(function_info::is_const_member == false) + requires(function_info::is_const_member == false) flexible_value invoke(T& callableObj, - M T::*callableFn, + M T::* callableFn, std::array names, const IDataSource& source, TExtraArguments&&... arguments) @@ -72,10 +72,10 @@ flexible_value invoke(T& callableObj, } template -requires(function_info::is_const_member == true) + requires(function_info::is_const_member == true) flexible_value invoke(const T& callableObj, - M T::*callableFn, + M T::* callableFn, std::array names, const IDataSource& source, TExtraArguments&&... arguments)