[Libreoffice-commits] core.git: external/skia

[Michael Stahl (via logerrit)]

 external/skia/fix-warnings.patch.1 |   11 +++++++++++
 1 file changed, 11 insertions(+)

New commits:
commit 3a1d90f4844f44ceea6b07ef8aa3947aae624825
Author:     Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Sun May 22 12:28:19 2022 +0200
Commit:     Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Mon May 23 10:14:38 2022 +0200

    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.wegh...@posteo.de>

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