external/skia/C4100warning.patch.1 | 31 ------------------------------- external/skia/UnpackedTarball_skia.mk | 1 - vcl/skia/win/gdiimpl.cxx | 5 +++++ 3 files changed, 5 insertions(+), 32 deletions(-)
New commits: commit 5623aac80c47ce538eda0c30428daf65afdcd5d9 Author: Xisco Fauli <[email protected]> AuthorDate: Fri Dec 19 09:38:41 2025 +0100 Commit: Xisco Fauli <[email protected]> CommitDate: Fri Dec 19 12:03:01 2025 +0100 skia: disable C4100 using #pragma warning As suggested by Mike Kaganski in https://gerrit.libreoffice.org/c/core/+/195856 Change-Id: I296c10bb563cf1e2261a540d0cfa2d8bad6f4cc4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195881 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> diff --git a/external/skia/C4100warning.patch.1 b/external/skia/C4100warning.patch.1 deleted file mode 100644 index cbe78fe14a6c..000000000000 --- a/external/skia/C4100warning.patch.1 +++ /dev/null @@ -1,31 +0,0 @@ ---- skia/tools/sk_app/Window.h 2025-12-18 18:13:35.508008948 +0100 -+++ skia/tools/sk_app/Window.h 2025-12-18 18:14:36.723788086 +0100 -@@ -89,19 +89,19 @@ - - // return value of 'true' means 'I have handled this event' - virtual void onBackendCreated() {} -- virtual void onAttach(Window* window) {} -- virtual bool onChar(SkUnichar c, skui::ModifierKey) { return false; } -+ virtual void onAttach(Window*) {} -+ virtual bool onChar(SkUnichar, skui::ModifierKey) { return false; } - virtual bool onKey(skui::Key, skui::InputState, skui::ModifierKey) { return false; } -- virtual bool onMouse(int x, int y, skui::InputState, skui::ModifierKey) { return false; } -- virtual bool onMouseWheel(float delta, int x, int y, skui::ModifierKey) { return false; } -- virtual bool onTouch(intptr_t owner, skui::InputState, float x, float y) { return false; } -+ virtual bool onMouse(int, int, skui::InputState, skui::ModifierKey) { return false; } -+ virtual bool onMouseWheel(float, int, int, skui::ModifierKey) { return false; } -+ virtual bool onTouch(intptr_t, skui::InputState, float, float) { return false; } - // Platform-detected gesture events -- virtual bool onFling(skui::InputState state) { return false; } -- virtual bool onPinch(skui::InputState state, float scale, float x, float y) { return false; } -- virtual void onUIStateChanged(const SkString& stateName, const SkString& stateValue) {} -+ virtual bool onFling(skui::InputState) { return false; } -+ virtual bool onPinch(skui::InputState, float, float, float) { return false; } -+ virtual void onUIStateChanged(const SkString&, const SkString&) {} - virtual void onPrePaint() {} - virtual void onPaint(SkSurface*) {} -- virtual void onResize(int width, int height) {} -+ virtual void onResize(int, int) {} - - private: - friend class Window; diff --git a/external/skia/UnpackedTarball_skia.mk b/external/skia/UnpackedTarball_skia.mk index a4d8e71e3b32..692eba0130e5 100644 --- a/external/skia/UnpackedTarball_skia.mk +++ b/external/skia/UnpackedTarball_skia.mk @@ -44,7 +44,6 @@ skia_patches := \ 0004-loong64-Fix-the-remaining-implicit-vector-casts.patch \ msvc-unknown-attributes.patch.1 \ fix-semaphore-include.patch.1 \ - C4100warning.patch.1 \ ifneq ($(MSYSTEM),) # use binary flag so patch from git-bash won't choke on mixed line-endings in patches diff --git a/vcl/skia/win/gdiimpl.cxx b/vcl/skia/win/gdiimpl.cxx index b14ae01c761b..3bcf5bf66926 100644 --- a/vcl/skia/win/gdiimpl.cxx +++ b/vcl/skia/win/gdiimpl.cxx @@ -30,7 +30,12 @@ #include <SkTypeface_win.h> #include <SkFont.h> #include <SkFontMgr.h> + +#pragma warning(push) +#pragma warning(disable : 4100) // "unreferenced formal parameter" #include <tools/window/win/WindowContextFactory_win.h> +#pragma warning(pop) + #include <tools/window/WindowContext.h> #include <windows.h>
