vcl/skia/SkiaHelper.cxx | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-)
New commits: commit 1d96d6d63a19360b385fba0db350d141f02eeb33 Author: Mike Kaganski <[email protected]> AuthorDate: Fri Dec 19 07:37:04 2025 +0100 Commit: Mike Kaganski <[email protected]> CommitDate: Fri Dec 19 09:01:46 2025 +0100 Cleanup the pragmas silencing an external's warnings 1. Make sure to restore warnings in MSVC after the include. 2. Only use `#pragma GCC diagnostic`, which works both in GCC and clang. Change-Id: I0e43659bd9aef5b3758801b474cc3188b1056790 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195876 Reviewed-by: Mike Kaganski <[email protected]> Tested-by: Jenkins diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index ff80f4a6dd22..89ad0e014e67 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -76,23 +76,20 @@ bool isAlphaMaskBlendingEnabled() { return false; } #include <include/encode/SkPngEncoder.h> #include <ganesh/SkSurfaceGanesh.h> #if defined _MSC_VER +#pragma warning(push) #pragma warning(disable : 4100) // "unreferenced formal parameter" #pragma warning(disable : 4324) // "structure was padded due to alignment specifier" #endif -#if defined __clang__ -#pragma clang diagnostic push -#pragma clang diagnostic ignored "-Wunused-parameter" -#endif -#if defined __GNUC__ && !defined __clang__ +#if defined __GNUC__ || defined __clang__ #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-parameter" #endif #include <src/image/SkImage_Base.h> -#if defined __GNUC__ && !defined __clang__ +#if defined __GNUC__ || defined __clang__ #pragma GCC diagnostic pop #endif -#if defined __clang__ -#pragma clang diagnostic pop +#if defined _MSC_VER +#pragma warning(pop) #endif #include <fstream>
