summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2024-10-07 15:02:43 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2024-10-08 14:22:47 +0200
commit0a90ed2524785ab84a65a1b7979797b7297e3000 (patch)
tree665f1f9f216d2581a86017810f34dd13081090e9 /vcl
parentbbcd4765eeb18bece792cd4588b8e7f9288bfcef (diff)
update to skia m119
the SkImageGenerator patch seems to have been upstreamed Change-Id: Ic2af62b9479c36394c6c0cf19d1c6f61edfff6b0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174653 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/skia/SkiaHelper.cxx2
-rw-r--r--vcl/skia/x11/textrender.cxx1
2 files changed, 2 insertions, 1 deletions
diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 76f8099000fc..09a294b86207 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -44,7 +44,7 @@ bool isAlphaMaskBlendingEnabled() { return false; }
#include <SkBitmap.h>
#include <SkCanvas.h>
-#include <SkEncodedImageFormat.h>
+#include <include/codec/SkEncodedImageFormat.h>
#include <SkPaint.h>
#include <SkSurface.h>
#include <SkGraphics.h>
diff --git a/vcl/skia/x11/textrender.cxx b/vcl/skia/x11/textrender.cxx
index 425710626fb5..ba94b44d7b0d 100644
--- a/vcl/skia/x11/textrender.cxx
+++ b/vcl/skia/x11/textrender.cxx
@@ -38,6 +38,7 @@
#include <SkFont.h>
#include <SkFontMgr_fontconfig.h>
+#include <SkFontTypes.h>
#if defined __GNUC__ && !defined __clang__
#pragma GCC diagnostic pop