From 82bf71e7802365089b396fd3e3e44b10180cc418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20M=C3=BCller?= Date: Sat, 2 Mar 2024 21:56:58 +0100 Subject: [PATCH] Refactor `IGraphics::CheckImageDivisibility` Put the context name in quotation marks in the warning message. Rename parameter `pFileName` to `pContextName`, as this name does not necessarily describe a file. Rename parameter `Img` to `Image` for consistency. --- src/engine/client/graphics_threaded.cpp | 29 +++++++++++++------------ src/engine/client/graphics_threaded.h | 2 +- src/engine/graphics.h | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/engine/client/graphics_threaded.cpp b/src/engine/client/graphics_threaded.cpp index 3f624be32..356fa9042 100644 --- a/src/engine/client/graphics_threaded.cpp +++ b/src/engine/client/graphics_threaded.cpp @@ -651,42 +651,43 @@ bool CGraphics_Threaded::LoadPng(CImageInfo &Image, const char *pFilename, int S return true; } -bool CGraphics_Threaded::CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) +bool CGraphics_Threaded::CheckImageDivisibility(const char *pContextName, CImageInfo &Image, int DivX, int DivY, bool AllowResize) { dbg_assert(DivX != 0 && DivY != 0, "Passing 0 to this function is not allowed."); bool ImageIsValid = true; - bool WidthBroken = Img.m_Width == 0 || (Img.m_Width % DivX) != 0; - bool HeightBroken = Img.m_Height == 0 || (Img.m_Height % DivY) != 0; + bool WidthBroken = Image.m_Width == 0 || (Image.m_Width % DivX) != 0; + bool HeightBroken = Image.m_Height == 0 || (Image.m_Height % DivY) != 0; if(WidthBroken || HeightBroken) { SWarning NewWarning; - str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg), Localize("The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs."), pFileName, DivX, DivY); - + char aContextNameQuoted[128]; + str_format(aContextNameQuoted, sizeof(aContextNameQuoted), "\"%s\"", pContextName); + str_format(NewWarning.m_aWarningMsg, sizeof(NewWarning.m_aWarningMsg), + Localize("The width of texture %s is not divisible by %d, or the height is not divisible by %d, which might cause visual bugs."), aContextNameQuoted, DivX, DivY); m_vWarnings.emplace_back(NewWarning); - ImageIsValid = false; } - if(AllowResize && !ImageIsValid && Img.m_Width > 0 && Img.m_Height > 0) + if(AllowResize && !ImageIsValid && Image.m_Width > 0 && Image.m_Height > 0) { int NewWidth = DivX; int NewHeight = DivY; if(WidthBroken) { - NewWidth = maximum(HighestBit(Img.m_Width), DivX); + NewWidth = maximum(HighestBit(Image.m_Width), DivX); NewHeight = (NewWidth / DivX) * DivY; } else { - NewHeight = maximum(HighestBit(Img.m_Height), DivY); + NewHeight = maximum(HighestBit(Image.m_Height), DivY); NewWidth = (NewHeight / DivY) * DivX; } - uint8_t *pNewImg = ResizeImage(Img.m_pData, Img.m_Width, Img.m_Height, NewWidth, NewHeight, Img.PixelSize()); - free(Img.m_pData); - Img.m_pData = pNewImg; - Img.m_Width = NewWidth; - Img.m_Height = NewHeight; + uint8_t *pNewImage = ResizeImage(Image.m_pData, Image.m_Width, Image.m_Height, NewWidth, NewHeight, Image.PixelSize()); + free(Image.m_pData); + Image.m_pData = pNewImage; + Image.m_Width = NewWidth; + Image.m_Height = NewHeight; ImageIsValid = true; } diff --git a/src/engine/client/graphics_threaded.h b/src/engine/client/graphics_threaded.h index 3255c67aa..06e82b920 100644 --- a/src/engine/client/graphics_threaded.h +++ b/src/engine/client/graphics_threaded.h @@ -983,7 +983,7 @@ public: IGraphics::CTextureHandle LoadTexture(const char *pFilename, int StorageType, int Flags = 0) override; bool LoadPng(CImageInfo &Image, const char *pFilename, int StorageType) override; - bool CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) override; + bool CheckImageDivisibility(const char *pContextName, CImageInfo &Image, int DivX, int DivY, bool AllowResize) override; bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) override; void CopyTextureBufferSub(uint8_t *pDestBuffer, const CImageInfo &SourceImage, size_t SubOffsetX, size_t SubOffsetY, size_t SubCopyWidth, size_t SubCopyHeight) override; diff --git a/src/engine/graphics.h b/src/engine/graphics.h index 14017affd..8bc5d59b2 100644 --- a/src/engine/graphics.h +++ b/src/engine/graphics.h @@ -331,7 +331,7 @@ public: virtual bool LoadPng(CImageInfo &Image, const char *pFilename, int StorageType) = 0; - virtual bool CheckImageDivisibility(const char *pFileName, CImageInfo &Img, int DivX, int DivY, bool AllowResize) = 0; + virtual bool CheckImageDivisibility(const char *pContextName, CImageInfo &Image, int DivX, int DivY, bool AllowResize) = 0; virtual bool IsImageFormatRGBA(const char *pFileName, CImageInfo &Img) = 0; // destination and source buffer require to have the same width and height