diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
| commit | 267c6f2ac71f92999e969232431ba04678e7437e (patch) | |
| tree | 358c9467650e1d0a1d7227a21dac2e3d08b622b2 /external/skia/fix-warnings.patch.1 | |
| parent | Initial commit. (diff) | |
| download | libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.tar.xz libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.zip | |
Adding upstream version 4:24.2.0.upstream/4%24.2.0
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.1 | 39 |
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 0000000000..46d55e493b --- /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: +- constexpr SkSamplingOptions(int maxAniso) : maxAniso(maxAniso) {} ++ constexpr SkSamplingOptions(int maxAniso_) : maxAniso(maxAniso_) {} + }; + + #endif |