Fixed: warnings

Author: TheNicker

FreeTypeWrapper/CMakeLists.txt

@@ -59,6 +59,7 @@ if (FREETYPE_WRAPPER_DISABLE_WARNINGS_EXTERNAL_LIBS)
             -Wno-nonportable-system-include-path
             -Wno-missing-noreturn
             -Wno-extra-semi-stmt
+            -Wno-switch-default
         )
         if (FREETYPE_WRAPPER_BUILD_FRIBIDI)
             target_compile_options(libfribidi PRIVATE 
@@ -76,7 +77,7 @@ if (FREETYPE_WRAPPER_DISABLE_WARNINGS_EXTERNAL_LIBS)
             -Wno-shadow
             -Wno-unsafe-buffer-usage
             -Wno-reserved-identifier
-            
+            -Wno-switch-default
             )
         endif()
 

FreeTypeWrapper/Source/BlitBox.h

@@ -5,7 +5,7 @@ namespace FreeType
 {
     struct BlitBox
     {
-        std::byte* buffer;
+        std::byte *buffer;
         uint32_t rowPitch;
         uint32_t width;
         uint32_t height;
@@ -18,19 +18,18 @@ namespace FreeType
             return (top * rowPitch) + (left * pixelSizeInbytes);
         }
 
+        LLUTILS_DISABLE_WARNING_PUSH
+        LLUTILS_DISABLE_WARNING_UNSAFE_BUFFER_USAGE
         template <typename color_type>
-        static void BlitPremultiplied (BlitBox& dst, const BlitBox& src)
+        static void BlitPremultiplied(BlitBox &dst, const BlitBox &src)
         {
-LLUTILS_DISABLE_WARNING_PUSH
-LLUTILS_DISABLE_WARNING_UNSAFE_BUFFER_USAGE
+            const std::byte *srcPos = src.buffer + src.GetStartOffset();
+            std::byte *dstPos = dst.buffer + dst.GetStartOffset();
 
-            const std::byte* srcPos = src.buffer + src.GetStartOffset();
-            std::byte* dstPos = dst.buffer + dst.GetStartOffset();
-
-            //Perform range check on target.
+            // Perform range check on target.
             if (dst.left + src.width > dst.width || dst.top + src.height > dst.height)
                 LL_EXCEPTION(LLUtils::Exception::ErrorCode::LogicError, "Buffer out of bounds");
-LLUTILS_DISABLE_WARNING_POP            
+
             const uint32_t bytesPerLine = src.pixelSizeInbytes * src.width;
 
             for (uint32_t y = src.top; y < src.height; y++)
@@ -39,27 +38,23 @@ LLUTILS_DISABLE_WARNING_POP
                 {
                     using namespace LLUtils;
 
-                    const color_type& srcColor = *reinterpret_cast<const color_type*>(srcPos + x);
-                    color_type& dstColor = *reinterpret_cast<color_type*>(dstPos + x);
+                    const color_type &srcColor = *reinterpret_cast<const color_type *>(srcPos + x);
+                    color_type &dstColor = *reinterpret_cast<color_type *>(dstPos + x);
                     dstColor = dstColor.BlendPreMultiplied(srcColor);
                 }
                 dstPos += dst.rowPitch;
                 srcPos += src.rowPitch;
             }
         }
 
-
-        static void Blit(BlitBox& dst, const BlitBox& src)
+        static void Blit(BlitBox &dst, const BlitBox &src)
         {
-LLUTILS_DISABLE_WARNING_PUSH
-LLUTILS_DISABLE_WARNING_UNSAFE_BUFFER_USAGE
-            const std::byte* srcPos = src.buffer + src.GetStartOffset();
-            std::byte* dstPos = dst.buffer + dst.GetStartOffset();
+            const std::byte *srcPos = src.buffer + src.GetStartOffset();
+            std::byte *dstPos = dst.buffer + dst.GetStartOffset();
 
-            //Perform range check on target.
+            // Perform range check on target.
             if (dst.left + src.width > dst.width || dst.top + src.height > dst.height)
                 LL_EXCEPTION(LLUtils::Exception::ErrorCode::LogicError, "Buffer out of bounds");
-LLUTILS_DISABLE_WARNING_POP
 
             const uint32_t bytesPerLine = src.pixelSizeInbytes * src.width;
 
@@ -69,13 +64,14 @@ LLUTILS_DISABLE_WARNING_POP
                 {
                     using namespace LLUtils;
 
-                    const Color& srcColor = *reinterpret_cast<const Color*>(srcPos + x);
-                    Color& dstColor = *reinterpret_cast<Color*>(dstPos + x);
+                    const Color &srcColor = *reinterpret_cast<const Color *>(srcPos + x);
+                    Color &dstColor = *reinterpret_cast<Color *>(dstPos + x);
                     dstColor = dstColor.Blend(srcColor);
                 }
                 dstPos += dst.rowPitch;
                 srcPos += src.rowPitch;
             }
         }
+        LLUTILS_DISABLE_WARNING_POP
     };
 }