2a4cf52b33
- Update to 7.2.1.2: * LO minor release - Added patches: * pld-skia-patches.patch * skia-freetype2.11.patch - Update to 7.2.0 * LO major release - Dropped patches: * use-comphelper.patch * bsc1184961.patch * bsc1185505.patch * bsc1185797.patch * bsc1182969.patch * bsc1187173.patch * tdf142839.patch * multicolumn-crash-fix.patch OBS-URL: https://build.opensuse.org/request/show/920848 OBS-URL: https://build.opensuse.org/package/show/LibreOffice:Factory/libreoffice?expand=0&rev=978
38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
--- skia/src/ports/SkFontHost_FreeType_common.cpp.orig 2021-03-01 15:53:09.178606791 +0100
|
|
+++ skia/src/ports/SkFontHost_FreeType_common.cpp 2021-08-12 17:48:32.358901987 +0200
|
|
@@ -665,8 +665,13 @@
|
|
canvas->drawPaint(paint);
|
|
break;
|
|
}
|
|
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
|
|
+ case FT_COLR_PAINTFORMAT_TRANSFORM: {
|
|
+ SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine);
|
|
+#else
|
|
case FT_COLR_PAINTFORMAT_TRANSFORMED: {
|
|
SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
|
|
+#endif
|
|
|
|
canvas->concat(transform);
|
|
break;
|
|
@@ -760,12 +765,20 @@
|
|
traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
|
|
FT_COLOR_NO_ROOT_TRANSFORM);
|
|
break;
|
|
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
|
|
+ case FT_COLR_PAINTFORMAT_TRANSFORM:
|
|
+#else
|
|
case FT_COLR_PAINTFORMAT_TRANSFORMED:
|
|
+#endif
|
|
canvas->saveLayer(nullptr, nullptr);
|
|
// Traverse / draw operation will apply transform.
|
|
colrv1_draw_paint(canvas, palette, face, paint);
|
|
traverse_result =
|
|
+#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
|
|
+ colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint);
|
|
+#else
|
|
colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint);
|
|
+#endif
|
|
canvas->restore();
|
|
break;
|
|
case FT_COLR_PAINTFORMAT_ROTATE:
|