summaryrefslogtreecommitdiffstats
path: root/external/skia/fix-warnings.patch.1
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 09:06:44 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-07 09:06:44 +0000
commited5640d8b587fbcfed7dd7967f3de04b37a76f26 (patch)
tree7a5f7c6c9d02226d7471cb3cc8fbbf631b415303 /external/skia/fix-warnings.patch.1
parentInitial commit. (diff)
downloadlibreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.tar.xz
libreoffice-ed5640d8b587fbcfed7dd7967f3de04b37a76f26.zip
Adding upstream version 4:7.4.7.upstream/4%7.4.7upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/skia/fix-warnings.patch.1')
-rw-r--r--external/skia/fix-warnings.patch.139
1 files changed, 39 insertions, 0 deletions
diff --git a/external/skia/fix-warnings.patch.1 b/external/skia/fix-warnings.patch.1
new file mode 100644
index 000000000..2aefd91c5
--- /dev/null
+++ b/external/skia/fix-warnings.patch.1
@@ -0,0 +1,39 @@
+diff --git a/include/core/SkFontParameters.h b/include/core/SkFontParameters.h
+index ae4f1d68b6..71263da7c5 100644
+--- a/include/core/SkFontParameters.h
++++ b/include/core/SkFontParameters.h
+@@ -16,8 +16,8 @@ struct SkFontParameters {
+ // Parameters in a variation font axis.
+ struct Axis {
+ constexpr Axis() : tag(0), min(0), def(0), max(0), flags(0) {}
+- constexpr Axis(SkFourByteTag tag, float min, float def, float max, bool hidden) :
+- tag(tag), min(min), def(def), max(max), flags(hidden ? HIDDEN : 0) {}
++ constexpr Axis(SkFourByteTag _tag, float _min, float _def, float _max, bool hidden) :
++ tag(_tag), min(_min), def(_def), max(_max), flags(hidden ? HIDDEN : 0) {}
+
+ // Four character identifier of the font axis (weight, width, slant, italic...).
+ SkFourByteTag tag;
+diff --git a/tools/sk_app/WindowContext.h b/tools/sk_app/WindowContext.h
+index f143dab013..be3cde0f4f 100644
+--- a/tools/sk_app/WindowContext.h
++++ b/tools/sk_app/WindowContext.h
+@@ -31,7 +31,7 @@ public:
+
+ virtual void resize(int w, int h) = 0;
+
+- virtual void activate(bool isActive) {}
++ virtual void activate(bool /*isActive*/) {}
+
+ 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