skia-freetype2.11.patch

   1 --- skia/src/ports/SkFontHost_FreeType_common.cpp.orig  2021-03-01 15:53:09.178606791 +0100
   2 +++ skia/src/ports/SkFontHost_FreeType_common.cpp       2021-08-12 17:48:32.358901987 +0200
   3 @@ -665,8 +665,13 @@
   4              canvas->drawPaint(paint);
   5              break;
   6          }
   7 +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
   8 +        case FT_COLR_PAINTFORMAT_TRANSFORM: {
   9 +            SkMatrix transform = ToSkMatrix(colrv1_paint.u.transform.affine);
  10 +#else
  11          case FT_COLR_PAINTFORMAT_TRANSFORMED: {
  12              SkMatrix transform = ToSkMatrix(colrv1_paint.u.transformed.affine);
  13 +#endif
  14
  15              canvas->concat(transform);
  16              break;
  17 @@ -760,12 +765,20 @@
  18              traverse_result = colrv1_start_glyph(canvas, palette, face, paint.u.colr_glyph.glyphID,
  19                                                   FT_COLOR_NO_ROOT_TRANSFORM);
  20              break;
  21 +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
  22 +        case FT_COLR_PAINTFORMAT_TRANSFORM:
  23 +#else
  24          case FT_COLR_PAINTFORMAT_TRANSFORMED:
  25 +#endif
  26              canvas->saveLayer(nullptr, nullptr);
  27              // Traverse / draw operation will apply transform.
  28              colrv1_draw_paint(canvas, palette, face, paint);
  29              traverse_result =
  30 +#if FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
  31 +                    colrv1_traverse_paint(canvas, palette, face, paint.u.transform.paint);
  32 +#else
  33                      colrv1_traverse_paint(canvas, palette, face, paint.u.transformed.paint);
  34 +#endif
  35              canvas->restore();
  36              break;
  37        case FT_COLR_PAINTFORMAT_ROTATE: