summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorMichael Stahl <michael.stahl@allotropia.de>2022-05-22 12:28:19 +0200
committerMichael Weghorn <m.weghorn@posteo.de>2022-05-23 10:14:38 +0200
commit3a1d90f4844f44ceea6b07ef8aa3947aae624825 (patch)
treedf6fdef2e0d96593f3b985a20dbd69f469a0e9c6 /external
parent5cf5df83aad9c9c97060043727337bdef8af10ec (diff)
skia: fix GCC12 -Werror=shadow
Change-Id: I0ec8e9d7d54b48281332cb5128d03ac28dad87e8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134737 Tested-by: Jenkins Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Diffstat (limited to 'external')
-rw-r--r--external/skia/fix-warnings.patch.111
1 files changed, 11 insertions, 0 deletions
diff --git a/external/skia/fix-warnings.patch.1 b/external/skia/fix-warnings.patch.1
index fc9418739810..2aefd91c52e4 100644
--- a/external/skia/fix-warnings.patch.1
+++ b/external/skia/fix-warnings.patch.1
@@ -26,3 +26,14 @@ index f143dab013..be3cde0f4f 100644
const DisplayParams& getDisplayParams() { return fDisplayParams; }
virtual void setDisplayParams(const DisplayParams& params) = 0;
+--- skia/include/core/SkSamplingOptions.h.orig 2022-05-22 12:25:06.112544528 +0200
++++ skia/include/core/SkSamplingOptions.h 2022-05-22 12:25:09.207636134 +0200
+@@ -97,7 +97,7 @@
+ bool isAniso() const { return maxAniso != 0; }
+
+ private:
+- SkSamplingOptions(int maxAniso) : maxAniso(maxAniso) {}
++ SkSamplingOptions(int maxAniso_) : maxAniso(maxAniso_) {}
+ };
+
+ #endif