From 8baeee37c21ad3ddc53ea3d34bd0d81bad8a4061 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Fri, 28 Jan 2022 22:04:57 +1100
Subject: [PATCH 01/23] Updated raqm to 0.8.0

---
 src/thirdparty/raqm/COPYING        |   2 +-
 src/thirdparty/raqm/NEWS           |  16 +-
 src/thirdparty/raqm/README.md      |  27 +-
 src/thirdparty/raqm/raqm-version.h |   6 +-
 src/thirdparty/raqm/raqm.c         | 391 ++++++++++++++++++++++-------
 src/thirdparty/raqm/raqm.h         |   9 +-
 6 files changed, 343 insertions(+), 108 deletions(-)

diff --git a/src/thirdparty/raqm/COPYING b/src/thirdparty/raqm/COPYING
index 196511ef688..78db981bb54 100644
--- a/src/thirdparty/raqm/COPYING
+++ b/src/thirdparty/raqm/COPYING
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright © 2015 Information Technology Authority (ITA) <foss@ita.gov.om>
-Copyright © 2016 Khaled Hosny <khaledhosny@eglug.org>
+Copyright © 2016-2021 Khaled Hosny <khaled@aliftype.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/thirdparty/raqm/NEWS b/src/thirdparty/raqm/NEWS
index c49176a95bf..ae1128485f2 100644
--- a/src/thirdparty/raqm/NEWS
+++ b/src/thirdparty/raqm/NEWS
@@ -1,4 +1,18 @@
-Overview of changes leading to 0.7.1
+Overview of changes leading to 0.8.0
+Monday, December 13, 2021
+====================================
+
+Remove autotools build.
+
+Support using SheenBiDi instead of FriBiDi for Unicode BiDi support.
+
+Fix running tests with Python <= 3.6.
+
+New API:
+  * raqm_get_par_resolved_direction
+  * raqm_get_direction_at_index
+
+Overview of changes leading to 0.7.2
 Monday, September 27, 2021
 ====================================
 
diff --git a/src/thirdparty/raqm/README.md b/src/thirdparty/raqm/README.md
index 64937343a6f..17ce2efc968 100644
--- a/src/thirdparty/raqm/README.md
+++ b/src/thirdparty/raqm/README.md
@@ -6,26 +6,26 @@ Raqm
 Raqm is a small library that encapsulates the logic for complex text layout and
 provides a convenient API.
 
-It currently provides bidirectional text support (using [FriBiDi][1]), shaping
-(using [HarfBuzz][2]), and proper script itemization. As a result,
-Raqm can support most writing systems covered by Unicode.
+It currently provides bidirectional text support (using [FriBiDi][1] or
+[SheenBidi][2]), shaping (using [HarfBuzz][3]), and proper script itemization.
+As a result, Raqm can support most writing systems covered by Unicode.
 
 The documentation can be accessed on the web at:
 > http://host-oman.github.io/libraqm/
 
 Raqm (Arabic: رَقْم) is writing, also number or digit and the Arabic word for
-digital (رَقَمِيّ) shares the same root, so it is a play on “digital writing”.
+digital (رَقَمِيّ) shares the same root, so it is a play on “digital writing”.
 
 Building
 --------
 
 Raqm depends on the following libraries:
-* [FreeType][3]
-* [HarfBuzz][2]
-* [FriBiDi][1]
+* [FreeType][4]
+* [HarfBuzz][3]
+* [FriBiDi][1] or [SheenBidi][2]
 
 To build the documentation you will also need:
-* [GTK-Doc][4]
+* [GTK-Doc][5]
 
 To install dependencies on Fedora:
 
@@ -48,11 +48,11 @@ directory:
     $ ninja -C build
     $ ninja -C build install
 
-To build the documentation, pass `-Ddocs=enable` to the `meson`.
+To build the documentation, pass `-Ddocs=true` to the `meson`.
 
 To run the tests:
 
-    $ ninja -C test
+    $ ninja -C build test
 
 Contributing
 ------------
@@ -78,6 +78,7 @@ The following projects have patches to support complex text layout using Raqm:
 
 
 [1]: http://fribidi.org
-[2]: http://harfbuzz.org
-[3]: https://www.freetype.org
-[4]: https://www.gtk.org/gtk-doc
+[2]: https://github.com/Tehreer/SheenBidi
+[3]: http://harfbuzz.org
+[4]: https://www.freetype.org
+[5]: https://www.gtk.org/gtk-doc
diff --git a/src/thirdparty/raqm/raqm-version.h b/src/thirdparty/raqm/raqm-version.h
index 8b115f612c6..e96b1aea564 100644
--- a/src/thirdparty/raqm/raqm-version.h
+++ b/src/thirdparty/raqm/raqm-version.h
@@ -32,10 +32,10 @@
 #define _RAQM_VERSION_H_
 
 #define RAQM_VERSION_MAJOR 0
-#define RAQM_VERSION_MINOR 7
-#define RAQM_VERSION_MICRO 2
+#define RAQM_VERSION_MINOR 8
+#define RAQM_VERSION_MICRO 0
 
-#define RAQM_VERSION_STRING "0.7.2"
+#define RAQM_VERSION_STRING "0.8.0"
 
 #define RAQM_VERSION_ATLEAST(major,minor,micro) \
     ((major)*10000+(minor)*100+(micro) <= \
diff --git a/src/thirdparty/raqm/raqm.c b/src/thirdparty/raqm/raqm.c
index 31161c9d91d..46890b9a7dd 100644
--- a/src/thirdparty/raqm/raqm.c
+++ b/src/thirdparty/raqm/raqm.c
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2015 Information Technology Authority (ITA) <foss@ita.gov.om>
- * Copyright © 2016 Khaled Hosny <khaledhosny@eglug.org>
+ * Copyright © 2016-2021 Khaled Hosny <khaled@aliftype.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -30,11 +30,18 @@
 #include <assert.h>
 #include <string.h>
 
+#ifdef RAQM_SHEENBIDI
+#include <SheenBidi.h>
+#else
 #ifdef HAVE_FRIBIDI_SYSTEM
 #include <fribidi.h>
 #else
 #include "../fribidi-shim/fribidi.h"
 #endif
+#if FRIBIDI_MAJOR_VERSION >= 1
+#define USE_FRIBIDI_EX_API
+#endif
+#endif
 
 #include <hb.h>
 #include <hb-ft.h>
@@ -56,10 +63,6 @@
 
 #include "raqm.h"
 
-#if FRIBIDI_MAJOR_VERSION >= 1
-#define USE_FRIBIDI_EX_API
-#endif
-
 /**
  * SECTION:raqm
  * @title: Raqm
@@ -178,6 +181,15 @@
 # define RAQM_TEST(...)
 #endif
 
+#define RAQM_BIDI_LEVEL_IS_RTL(level) \
+    ((level) & 1)
+
+#ifdef RAQM_SHEENBIDI
+  typedef SBLevel _raqm_bidi_level_t;
+#else
+  typedef FriBidiLevel _raqm_bidi_level_t;
+#endif
+
 typedef enum {
   RAQM_FLAG_NONE = 0,
   RAQM_FLAG_UTF8 = 1 << 0
@@ -438,6 +450,53 @@ raqm_set_text (raqm_t         *rq,
   return true;
 }
 
+static void *
+_raqm_get_utf8_codepoint (const void *str,
+                          uint32_t *out_codepoint)
+{
+  const char *s = (const char *)str;
+
+  if (0xf0 == (0xf8 & s[0]))
+  {
+    *out_codepoint = ((0x07 & s[0]) << 18) | ((0x3f & s[1]) << 12) | ((0x3f & s[2]) << 6) | (0x3f & s[3]);
+    s += 4;
+  }
+  else if (0xe0 == (0xf0 & s[0]))
+  {
+    *out_codepoint = ((0x0f & s[0]) << 12) | ((0x3f & s[1]) << 6) | (0x3f & s[2]);
+    s += 3;
+  }
+  else if (0xc0 == (0xe0 & s[0]))
+  {
+    *out_codepoint = ((0x1f & s[0]) << 6) | (0x3f & s[1]);
+    s += 2;
+  }
+  else
+  {
+    *out_codepoint = s[0];
+    s += 1;
+  }
+
+  return (void *)s;
+}
+
+static size_t
+_raqm_u8_to_u32 (const char *text, size_t len, uint32_t *unicode)
+{
+  size_t in_len = 0;
+  uint32_t *out_utf32 = unicode;
+  const char *in_utf8 = text;
+
+  while ((*in_utf8 != '\0') && (in_len < len))
+  {
+    in_utf8 = _raqm_get_utf8_codepoint (in_utf8, out_utf32);
+    ++out_utf32;
+    ++in_len;
+  }
+
+  return (out_utf32 - unicode);
+}
+
 /**
  * raqm_set_text_utf8:
  * @rq: a #raqm_t.
@@ -482,9 +541,7 @@ raqm_set_text_utf8 (raqm_t         *rq,
 
   memcpy (rq->text_utf8, text, sizeof (char) * len);
 
-  ulen = fribidi_charset_to_unicode (FRIBIDI_CHAR_SET_UTF8,
-                                     text, len, unicode);
-
+  ulen = _raqm_u8_to_u32 (text, len, unicode);
   ok = raqm_set_text (rq, unicode, ulen);
 
   free (unicode);
@@ -504,7 +561,7 @@ raqm_set_text_utf8 (raqm_t         *rq,
  *
  * The default is #RAQM_DIRECTION_DEFAULT, which determines the paragraph
  * direction based on the first character with strong bidi type (see [rule
- * P2](https://unicode.org/reports/tr9/#P2) in Unicode Bidirectional Algorithm),
+ * P2](http://unicode.org/reports/tr9/#P2) in Unicode Bidirectional Algorithm),
  * which can be good enough for many cases but has problems when a mainly
  * right-to-left paragraph starts with a left-to-right character and vice versa
  * as the detected paragraph direction will be the wrong one, or when text does
@@ -971,17 +1028,78 @@ raqm_get_glyphs (raqm_t *rq,
   return rq->glyphs;
 }
 
+/**
+ * raqm_get_par_resolved_direction:
+ * @rq: a #raqm_t.
+ *
+ * Gets the resolved direction of the paragraph;
+ *
+ * Return value:
+ * The #raqm_direction_t specifying the resolved direction of text,
+ * or #RAQM_DIRECTION_DEFAULT if raqm_layout() has not been called on @rq.
+ *
+ * Since: 0.8
+ */
+RAQM_API raqm_direction_t
+raqm_get_par_resolved_direction (raqm_t *rq)
+{
+  if (!rq)
+    return RAQM_DIRECTION_DEFAULT;
+
+  return rq->resolved_dir;
+}
+
+/**
+ * raqm_get_direction_at_index:
+ * @rq: a #raqm_t.
+ * @index: (in): character index.
+ *
+ * Gets the resolved direction of the character at specified index;
+ *
+ * Return value:
+ * The #raqm_direction_t specifying the resolved direction of text at the
+ * specified index, or #RAQM_DIRECTION_DEFAULT if raqm_layout() has not been
+ * called on @rq.
+ *
+ * Since: 0.8
+ */
+RAQM_API raqm_direction_t
+raqm_get_direction_at_index (raqm_t *rq,
+                             size_t index)
+{
+  if (!rq)
+    return RAQM_DIRECTION_DEFAULT;
+
+  for (raqm_run_t *run = rq->runs; run != NULL; run = run->next)
+  {
+    if (run->pos <= index && index < run->pos + run->len) {
+      switch (run->direction) {
+        case HB_DIRECTION_LTR:
+          return RAQM_DIRECTION_LTR;
+        case HB_DIRECTION_RTL:
+          return RAQM_DIRECTION_RTL;
+        case HB_DIRECTION_TTB:
+          return RAQM_DIRECTION_TTB;
+        default:
+          return RAQM_DIRECTION_DEFAULT;
+      }
+    }
+  }
+
+  return RAQM_DIRECTION_DEFAULT;
+}
+
 static bool
 _raqm_resolve_scripts (raqm_t *rq);
 
 static hb_direction_t
-_raqm_hb_dir (raqm_t *rq, FriBidiLevel level)
+_raqm_hb_dir (raqm_t *rq, _raqm_bidi_level_t level)
 {
   hb_direction_t dir = HB_DIRECTION_LTR;
 
   if (rq->base_dir == RAQM_DIRECTION_TTB)
       dir = HB_DIRECTION_TTB;
-  else if (FRIBIDI_LEVEL_IS_RTL (level))
+  else if (RAQM_BIDI_LEVEL_IS_RTL(level))
       dir = HB_DIRECTION_RTL;
 
   return dir;
@@ -990,9 +1108,65 @@ _raqm_hb_dir (raqm_t *rq, FriBidiLevel level)
 typedef struct {
   size_t pos;
   size_t len;
-  FriBidiLevel level;
+  _raqm_bidi_level_t level;
 } _raqm_bidi_run;
 
+#ifdef RAQM_SHEENBIDI
+static _raqm_bidi_run *
+_raqm_bidi_itemize (raqm_t *rq, size_t *run_count)
+{
+  _raqm_bidi_run *runs;
+  SBAlgorithmRef bidi;
+  SBParagraphRef par;
+  SBUInteger par_len;
+  SBLineRef line;
+
+  SBLevel base_level = SBLevelDefaultLTR;
+  SBCodepointSequence input = {
+     SBStringEncodingUTF32,
+     (void *) rq->text,
+     rq->text_len
+  };
+
+  if (rq->base_dir == RAQM_DIRECTION_RTL)
+    base_level = 1;
+  else if (rq->base_dir == RAQM_DIRECTION_LTR)
+    base_level = 0;
+
+  /* paragraph */
+  bidi = SBAlgorithmCreate (&input);
+  par = SBAlgorithmCreateParagraph (bidi, 0, INT32_MAX, base_level);
+  par_len = SBParagraphGetLength (par);
+
+  /* lines */
+  line = SBParagraphCreateLine (par, 0, par_len);
+  *run_count = SBLineGetRunCount (line);
+
+  if (SBParagraphGetBaseLevel (par) == 0)
+    rq->resolved_dir = RAQM_DIRECTION_LTR;
+  else
+    rq->resolved_dir = RAQM_DIRECTION_RTL;
+
+  runs = malloc (sizeof (_raqm_bidi_run) * (*run_count));
+  if (runs)
+  {
+    const SBRun *sheenbidi_runs = SBLineGetRunsPtr(line);
+
+    for (size_t i = 0; i < (*run_count); ++i)
+    {
+      runs[i].pos = sheenbidi_runs[i].offset;
+      runs[i].len = sheenbidi_runs[i].length;
+      runs[i].level = sheenbidi_runs[i].level;
+    }
+  }
+
+  SBLineRelease (line);
+  SBParagraphRelease (par);
+  SBAlgorithmRelease (bidi);
+
+  return runs;
+}
+#else
 static void
 _raqm_reverse_run (_raqm_bidi_run *run, const size_t len)
 {
@@ -1093,52 +1267,31 @@ _raqm_reorder_runs (const FriBidiCharType *types,
   return runs;
 }
 
-static bool
-_raqm_itemize (raqm_t *rq)
+static _raqm_bidi_run *
+_raqm_bidi_itemize (raqm_t *rq, size_t *run_count)
 {
   FriBidiParType par_type = FRIBIDI_PAR_ON;
+  _raqm_bidi_run *runs = NULL;
+
   FriBidiCharType *types;
+  _raqm_bidi_level_t *levels;
+  int max_level = 0;
 #ifdef USE_FRIBIDI_EX_API
   FriBidiBracketType *btypes;
 #endif
-  FriBidiLevel *levels;
-  _raqm_bidi_run *runs = NULL;
-  raqm_run_t *last;
-  int max_level;
-  size_t run_count;
-  bool ok = true;
-
-#ifdef RAQM_TESTING
-  switch (rq->base_dir)
-  {
-    case RAQM_DIRECTION_RTL:
-      RAQM_TEST ("Direction is: RTL\n\n");
-      break;
-    case RAQM_DIRECTION_LTR:
-      RAQM_TEST ("Direction is: LTR\n\n");
-      break;
-    case RAQM_DIRECTION_TTB:
-      RAQM_TEST ("Direction is: TTB\n\n");
-      break;
-    case RAQM_DIRECTION_DEFAULT:
-    default:
-      RAQM_TEST ("Direction is: DEFAULT\n\n");
-      break;
-  }
-#endif
 
   types = calloc (rq->text_len, sizeof (FriBidiCharType));
 #ifdef USE_FRIBIDI_EX_API
   btypes = calloc (rq->text_len, sizeof (FriBidiBracketType));
 #endif
-  levels = calloc (rq->text_len, sizeof (FriBidiLevel));
+  levels = calloc (rq->text_len, sizeof (_raqm_bidi_level_t));
+
   if (!types || !levels
 #ifdef USE_FRIBIDI_EX_API
       || !btypes
 #endif
       )
   {
-    ok = false;
     goto done;
   }
 
@@ -1147,38 +1300,65 @@ _raqm_itemize (raqm_t *rq)
   else if (rq->base_dir == RAQM_DIRECTION_LTR)
     par_type = FRIBIDI_PAR_LTR;
 
-  if (rq->base_dir == RAQM_DIRECTION_TTB)
-  {
-    /* Treat every thing as LTR in vertical text */
-    max_level = 1;
-    memset (types, FRIBIDI_TYPE_LTR, rq->text_len);
-    memset (levels, 0, rq->text_len);
-    rq->resolved_dir = RAQM_DIRECTION_LTR;
-  }
-  else
-  {
-    fribidi_get_bidi_types (rq->text, rq->text_len, types);
+  fribidi_get_bidi_types (rq->text, rq->text_len, types);
 #ifdef USE_FRIBIDI_EX_API
-    fribidi_get_bracket_types (rq->text, rq->text_len, types, btypes);
-    max_level = fribidi_get_par_embedding_levels_ex (types, btypes,
-                                                     rq->text_len, &par_type,
-                                                     levels);
+  fribidi_get_bracket_types (rq->text, rq->text_len, types, btypes);
+  max_level = fribidi_get_par_embedding_levels_ex (types, btypes,
+                                                   rq->text_len, &par_type,
+                                                   levels);
 #else
-    max_level = fribidi_get_par_embedding_levels (types, rq->text_len,
-                                                  &par_type, levels);
+  max_level = fribidi_get_par_embedding_levels (types, rq->text_len,
+                                                &par_type, levels);
 #endif
 
-   if (par_type == FRIBIDI_PAR_LTR)
-     rq->resolved_dir = RAQM_DIRECTION_LTR;
-   else
-     rq->resolved_dir = RAQM_DIRECTION_RTL;
-  }
+  if (par_type == FRIBIDI_PAR_LTR)
+    rq->resolved_dir = RAQM_DIRECTION_LTR;
+  else
+    rq->resolved_dir = RAQM_DIRECTION_RTL;
 
   if (max_level == 0)
-  {
-    ok = false;
     goto done;
+
+  /* Get the number of bidi runs */
+  runs = _raqm_reorder_runs (types, rq->text_len, par_type, levels, run_count);
+
+done:
+  free (types);
+  free (levels);
+#ifdef USE_FRIBIDI_EX_API
+  free (btypes);
+#endif
+
+  return runs;
+}
+#endif
+
+static bool
+_raqm_itemize (raqm_t *rq)
+{
+  _raqm_bidi_run *runs = NULL;
+  raqm_run_t *last;
+  size_t run_count = 0;
+  bool ok = true;
+
+#ifdef RAQM_TESTING
+  switch (rq->base_dir)
+  {
+    case RAQM_DIRECTION_RTL:
+      RAQM_TEST ("Direction is: RTL\n\n");
+      break;
+    case RAQM_DIRECTION_LTR:
+      RAQM_TEST ("Direction is: LTR\n\n");
+      break;
+    case RAQM_DIRECTION_TTB:
+      RAQM_TEST ("Direction is: TTB\n\n");
+      break;
+    case RAQM_DIRECTION_DEFAULT:
+    default:
+      RAQM_TEST ("Direction is: DEFAULT\n\n");
+      break;
   }
+#endif
 
   if (!_raqm_resolve_scripts (rq))
   {
@@ -1186,8 +1366,22 @@ _raqm_itemize (raqm_t *rq)
     goto done;
   }
 
-  /* Get the number of bidi runs */
-  runs = _raqm_reorder_runs (types, rq->text_len, par_type, levels, &run_count);
+  if (rq->base_dir == RAQM_DIRECTION_TTB)
+  {
+    /* Treat every thing as LTR in vertical text */
+    run_count = 1;
+    rq->resolved_dir = RAQM_DIRECTION_TTB;
+    runs = malloc (sizeof (_raqm_bidi_run));
+    if (runs)
+    {
+      runs->pos = 0;
+      runs->len = rq->text_len;
+      runs->level = 0;
+    }
+  } else {
+    runs = _raqm_bidi_itemize (rq, &run_count);
+  }
+
   if (!runs)
   {
     ok = false;
@@ -1197,7 +1391,7 @@ _raqm_itemize (raqm_t *rq)
 #ifdef RAQM_TESTING
   RAQM_TEST ("Number of runs before script itemization: %zu\n\n", run_count);
 
-  RAQM_TEST ("Fribidi Runs:\n");
+  RAQM_TEST ("BiDi Runs:\n");
   for (size_t i = 0; i < run_count; i++)
   {
     RAQM_TEST ("run[%zu]:\t start: %zu\tlength: %zu\tlevel: %d\n",
@@ -1309,11 +1503,6 @@ _raqm_itemize (raqm_t *rq)
 
 done:
   free (runs);
-  free (types);
-#ifdef USE_FRIBIDI_EX_API
-  free (btypes);
-#endif
-  free (levels);
 
   return ok;
 }
@@ -1328,7 +1517,7 @@ typedef struct {
 
 /* Special paired characters for script detection */
 static size_t paired_len = 34;
-static const FriBidiChar paired_chars[] =
+static const uint32_t paired_chars[] =
 {
   0x0028, 0x0029, /* ascii paired punctuation */
   0x003c, 0x003e,
@@ -1431,7 +1620,7 @@ _raqm_stack_push (_raqm_stack_t *stack,
 }
 
 static int
-_get_pair_index (const FriBidiChar ch)
+_get_pair_index (const uint32_t ch)
 {
   int lower = 0;
   int upper = paired_len - 1;
@@ -1569,6 +1758,7 @@ _raqm_resolve_scripts (raqm_t *rq)
   return true;
 }
 
+#ifdef HAVE_FT_GET_TRANSFORM
 static void
 _raqm_ft_transform (int      *x,
                     int      *y,
@@ -1583,6 +1773,7 @@ _raqm_ft_transform (int      *x,
   *x = vector.x;
   *y = vector.y;
 }
+#endif
 
 static bool
 _raqm_shape (raqm_t *rq)
@@ -1634,20 +1825,30 @@ _raqm_shape (raqm_t *rq)
   return true;
 }
 
+/* Count equivalent UTF-8 bytes in codepoint */
+static size_t
+_raqm_count_codepoint_utf8_bytes (uint32_t chr)
+{
+  if (0 == ((uint32_t) 0xffffff80 & chr))
+    return 1;
+  else if (0 == ((uint32_t) 0xfffff800 & chr))
+    return 2;
+  else if (0 == ((uint32_t) 0xffff0000 & chr))
+    return 3;
+  else
+    return 4;
+}
+
 /* Convert index from UTF-32 to UTF-8 */
 static uint32_t
 _raqm_u32_to_u8_index (raqm_t   *rq,
                        uint32_t  index)
 {
-  FriBidiStrIndex length;
-  char *output = malloc ((sizeof (char) * 4 * index) + 1);
+  size_t length = 0;
 
-  length = fribidi_unicode_to_charset (FRIBIDI_CHAR_SET_UTF8,
-                                       rq->text,
-                                       index,
-                                       output);
+  for (uint32_t i = 0; i < index; ++i)
+    length += _raqm_count_codepoint_utf8_bytes (rq->text[i]);
 
-  free (output);
   return length;
 }
 
@@ -1656,15 +1857,27 @@ static uint32_t
 _raqm_u8_to_u32_index (raqm_t   *rq,
                        uint32_t  index)
 {
-  FriBidiStrIndex length;
-  uint32_t *output = malloc (sizeof (uint32_t) * (index + 1));
+  const unsigned char *s = (const unsigned char *) rq->text_utf8;
+  const unsigned char *t = s;
+  size_t length = 0;
+
+  while (((size_t) (s - t) < index) && ('\0' != *s))
+  {
+    if (0xf0 == (0xf8 & *s))
+      s += 4;
+    else if (0xe0 == (0xf0 & *s))
+      s += 3;
+    else if (0xc0 == (0xe0 & *s))
+      s += 2;
+    else
+      s += 1;
+
+    length++;
+  }
 
-  length = fribidi_charset_to_unicode (FRIBIDI_CHAR_SET_UTF8,
-                                       rq->text_utf8,
-                                       index,
-                                       output);
+  if ((size_t) (s-t) > index)
+    length--;
 
-  free (output);
   return length;
 }
 
diff --git a/src/thirdparty/raqm/raqm.h b/src/thirdparty/raqm/raqm.h
index 342afc8b29b..faab855915a 100644
--- a/src/thirdparty/raqm/raqm.h
+++ b/src/thirdparty/raqm/raqm.h
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2015 Information Technology Authority (ITA) <foss@ita.gov.om>
- * Copyright © 2016 Khaled Hosny <khaledhosny@eglug.org>
+ * Copyright © 2016-2021 Khaled Hosny <khaled@aliftype.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -156,6 +156,13 @@ RAQM_API raqm_glyph_t *
 raqm_get_glyphs (raqm_t *rq,
                  size_t *length);
 
+RAQM_API raqm_direction_t
+raqm_get_par_resolved_direction (raqm_t *rq);
+
+RAQM_API raqm_direction_t
+raqm_get_direction_at_index (raqm_t *rq,
+                             size_t index);
+
 RAQM_API bool
 raqm_index_to_position (raqm_t *rq,
                         size_t *index,

From 255b14303a3a8d2dd3a6282537869a80d19caa35 Mon Sep 17 00:00:00 2001
From: DWesl <22566757+DWesl@users.noreply.github.com>
Date: Sat, 18 Dec 2021 10:00:14 -0500
Subject: [PATCH 02/23] TST: Parametrize numpy roundtrip to find failing case

Segfaults are annoying to debug.
---
 Tests/test_numpy.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/Tests/test_numpy.py b/Tests/test_numpy.py
index def7adf3f02..936474fe8d2 100644
--- a/Tests/test_numpy.py
+++ b/Tests/test_numpy.py
@@ -189,8 +189,9 @@ def test_putdata():
     assert len(im.getdata()) == len(arr)
 
 
-def test_roundtrip_eye():
-    for dtype in (
+@pytest.mark.parametrize(
+    "dtype",
+    (
         bool,
         numpy.bool8,
         numpy.int8,
@@ -202,9 +203,11 @@ def test_roundtrip_eye():
         float,
         numpy.float32,
         numpy.float64,
-    ):
-        arr = numpy.eye(10, dtype=dtype)
-        numpy.testing.assert_array_equal(arr, numpy.array(Image.fromarray(arr)))
+    ),
+)
+def test_roundtrip_eye(dtype):
+    arr = numpy.eye(10, dtype=dtype)
+    numpy.testing.assert_array_equal(arr, numpy.array(Image.fromarray(arr)))
 
 
 def test_zero_size():

From a5642f020770cbb47b704b0314c97bb35a3d5ee4 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 30 Jan 2022 08:01:35 +1100
Subject: [PATCH 03/23] Updated lcms2 to 2.13

---
 docs/installation.rst     | 2 +-
 winbuild/build_prepare.py | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/installation.rst b/docs/installation.rst
index ea0e7850010..88aaf58341d 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -169,7 +169,7 @@ Many of Pillow's features require external libraries:
 * **littlecms** provides color management
 
   * Pillow version 2.2.1 and below uses liblcms1, Pillow 2.3.0 and
-    above uses liblcms2. Tested with **1.19** and **2.7-2.12**.
+    above uses liblcms2. Tested with **1.19** and **2.7-2.13**.
 
 * **libwebp** provides the WebP format.
 
diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 3092c5a2ba8..78916987c34 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -219,9 +219,9 @@ def cmd_msbuild(
         # "bins": [r"objs\{msbuild_arch}\Release\freetype.dll"],
     },
     "lcms2": {
-        "url": SF_MIRROR + "/project/lcms/lcms/2.12/lcms2-2.12.tar.gz",
-        "filename": "lcms2-2.12.tar.gz",
-        "dir": "lcms2-2.12",
+        "url": SF_MIRROR + "/project/lcms/lcms/2.12/lcms2-2.13.tar.gz",
+        "filename": "lcms2-2.13.tar.gz",
+        "dir": "lcms2-2.13",
         "patch": {
             r"Projects\VC2017\lcms2_static\lcms2_static.vcxproj": {
                 # default is /MD for x86 and /MT for x64, we need /MD always

From a83e8d12479f9b88e95d02a3cd4e38c391e42683 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sun, 30 Jan 2022 14:40:30 +1100
Subject: [PATCH 04/23] Switched from windows-2019 to windows-latest

---
 .github/workflows/test-mingw.yml   | 2 +-
 .github/workflows/test-windows.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test-mingw.yml b/.github/workflows/test-mingw.yml
index d94c7d53751..8a9c1725d9a 100644
--- a/.github/workflows/test-mingw.yml
+++ b/.github/workflows/test-mingw.yml
@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:
diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
index c768838eb06..c78f9fd24ec 100644
--- a/.github/workflows/test-windows.yml
+++ b/.github/workflows/test-windows.yml
@@ -4,7 +4,7 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
-    runs-on: windows-2019
+    runs-on: windows-latest
     strategy:
       fail-fast: false
       matrix:

From 9b1857f0fb14a8e58e9b5dc82f1104a8a22eb918 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 31 Jan 2022 08:05:01 +1100
Subject: [PATCH 05/23] Updated raqm to 0.9.0

---
 depends/install_raqm.sh            |   2 +-
 src/thirdparty/raqm/COPYING        |   2 +-
 src/thirdparty/raqm/README.md      |   5 +-
 src/thirdparty/raqm/raqm-version.h |   4 +-
 src/thirdparty/raqm/raqm.c         | 470 ++++++++++++++++++-----------
 src/thirdparty/raqm/raqm.h         |  11 +-
 6 files changed, 310 insertions(+), 184 deletions(-)

diff --git a/depends/install_raqm.sh b/depends/install_raqm.sh
index 39b998d0545..99250365065 100755
--- a/depends/install_raqm.sh
+++ b/depends/install_raqm.sh
@@ -2,7 +2,7 @@
 # install raqm
 
 
-archive=libraqm-0.8.0
+archive=libraqm-0.9.0
 
 ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
 
diff --git a/src/thirdparty/raqm/COPYING b/src/thirdparty/raqm/COPYING
index 78db981bb54..c605a5dc67a 100644
--- a/src/thirdparty/raqm/COPYING
+++ b/src/thirdparty/raqm/COPYING
@@ -1,7 +1,7 @@
 The MIT License (MIT)
 
 Copyright © 2015 Information Technology Authority (ITA) <foss@ita.gov.om>
-Copyright © 2016-2021 Khaled Hosny <khaled@aliftype.com>
+Copyright © 2016-2022 Khaled Hosny <khaled@aliftype.com>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/src/thirdparty/raqm/README.md b/src/thirdparty/raqm/README.md
index 17ce2efc968..02e996e7a9c 100644
--- a/src/thirdparty/raqm/README.md
+++ b/src/thirdparty/raqm/README.md
@@ -68,6 +68,7 @@ Projects using Raqm
 3. [FontView](https://github.com/googlei18n/fontview)
 4. [Pillow](https://github.com/python-pillow)
 5. [mplcairo](https://github.com/anntzer/mplcairo)
+6. [CEGUI](https://github.com/cegui/cegui)
 
 The following projects have patches to support complex text layout using Raqm:
 
@@ -77,8 +78,8 @@ The following projects have patches to support complex text layout using Raqm:
 
 
 
-[1]: http://fribidi.org
+[1]: https://github.com/fribidi/fribidi
 [2]: https://github.com/Tehreer/SheenBidi
-[3]: http://harfbuzz.org
+[3]: https://github.com/harfbuzz/harfbuzz
 [4]: https://www.freetype.org
 [5]: https://www.gtk.org/gtk-doc
diff --git a/src/thirdparty/raqm/raqm-version.h b/src/thirdparty/raqm/raqm-version.h
index e96b1aea564..78b70a5615e 100644
--- a/src/thirdparty/raqm/raqm-version.h
+++ b/src/thirdparty/raqm/raqm-version.h
@@ -32,10 +32,10 @@
 #define _RAQM_VERSION_H_
 
 #define RAQM_VERSION_MAJOR 0
-#define RAQM_VERSION_MINOR 8
+#define RAQM_VERSION_MINOR 9
 #define RAQM_VERSION_MICRO 0
 
-#define RAQM_VERSION_STRING "0.8.0"
+#define RAQM_VERSION_STRING "0.9.0"
 
 #define RAQM_VERSION_ATLEAST(major,minor,micro) \
     ((major)*10000+(minor)*100+(micro) <= \
diff --git a/src/thirdparty/raqm/raqm.c b/src/thirdparty/raqm/raqm.c
index 46890b9a7dd..f852542b43e 100644
--- a/src/thirdparty/raqm/raqm.c
+++ b/src/thirdparty/raqm/raqm.c
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2015 Information Technology Authority (ITA) <foss@ita.gov.om>
- * Copyright © 2016-2021 Khaled Hosny <khaled@aliftype.com>
+ * Copyright © 2016-2022 Khaled Hosny <khaled@aliftype.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -24,7 +24,6 @@
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
-#undef HAVE_CONFIG_H  // Workaround for Fribidi 1.0.5 and earlier
 #endif
 
 #include <assert.h>
@@ -38,9 +37,6 @@
 #else
 #include "../fribidi-shim/fribidi.h"
 #endif
-#if FRIBIDI_MAJOR_VERSION >= 1
-#define USE_FRIBIDI_EX_API
-#endif
 #endif
 
 #include <hb.h>
@@ -190,13 +186,9 @@
   typedef FriBidiLevel _raqm_bidi_level_t;
 #endif
 
-typedef enum {
-  RAQM_FLAG_NONE = 0,
-  RAQM_FLAG_UTF8 = 1 << 0
-} _raqm_flags_t;
-
 typedef struct {
   FT_Face       ftface;
+  int           ftloadflags;
   hb_language_t lang;
   hb_script_t   script;
 } _raqm_text_info;
@@ -209,6 +201,7 @@ struct _raqm {
   uint32_t        *text;
   char            *text_utf8;
   size_t           text_len;
+  size_t           text_capacity_bytes;
 
   _raqm_text_info *text_info;
 
@@ -219,17 +212,17 @@ struct _raqm {
   size_t           features_len;
 
   raqm_run_t      *runs;
-  raqm_glyph_t    *glyphs;
+  raqm_run_t      *runs_pool;
 
-  _raqm_flags_t    flags;
+  raqm_glyph_t    *glyphs;
+  size_t           glyphs_capacity;
 
-  int              ft_loadflags;
   int              invisible_glyph;
 };
 
 struct _raqm_run {
-  int            pos;
-  int            len;
+  uint32_t       pos;
+  uint32_t       len;
 
   hb_direction_t direction;
   hb_script_t    script;
@@ -243,31 +236,21 @@ static uint32_t
 _raqm_u8_to_u32_index (raqm_t   *rq,
                        uint32_t  index);
 
-static bool
+static void
 _raqm_init_text_info (raqm_t *rq)
 {
-  hb_language_t default_lang;
-
-  if (rq->text_info)
-    return true;
-
-  rq->text_info = malloc (sizeof (_raqm_text_info) * rq->text_len);
-  if (!rq->text_info)
-    return false;
-
-  default_lang = hb_language_get_default ();
+  hb_language_t default_lang = hb_language_get_default ();
   for (size_t i = 0; i < rq->text_len; i++)
   {
     rq->text_info[i].ftface = NULL;
+    rq->text_info[i].ftloadflags = -1;
     rq->text_info[i].lang = default_lang;
     rq->text_info[i].script = HB_SCRIPT_INVALID;
   }
-
-  return true;
 }
 
 static void
-_raqm_free_text_info (raqm_t *rq)
+_raqm_release_text_info (raqm_t *rq)
 {
   if (!rq->text_info)
     return;
@@ -277,9 +260,6 @@ _raqm_free_text_info (raqm_t *rq)
     if (rq->text_info[i].ftface)
       FT_Done_Face (rq->text_info[i].ftface);
   }
-
-  free (rq->text_info);
-  rq->text_info = NULL;
 }
 
 static bool
@@ -289,6 +269,9 @@ _raqm_compare_text_info (_raqm_text_info a,
   if (a.ftface != b.ftface)
     return false;
 
+  if (a.ftloadflags != b.ftloadflags)
+    return false;
+
   if (a.lang != b.lang)
     return false;
 
@@ -298,6 +281,88 @@ _raqm_compare_text_info (_raqm_text_info a,
   return true;
 }
 
+static void
+_raqm_free_text(raqm_t* rq)
+{
+  free (rq->text);
+  rq->text = NULL;
+  rq->text_info = NULL;
+  rq->text_utf8 = NULL;
+  rq->text_len = 0;
+  rq->text_capacity_bytes = 0;
+}
+
+static bool
+_raqm_alloc_text(raqm_t *rq,
+                 size_t  len,
+                 bool    need_utf8)
+{
+  /* Allocate contiguous memory block for texts and text_info */
+  size_t mem_size = (sizeof (uint32_t) + sizeof (_raqm_text_info)) * len;
+  if (need_utf8)
+    mem_size += sizeof (char) * len;
+
+  if (mem_size > rq->text_capacity_bytes)
+  {
+    void* new_mem = realloc (rq->text, mem_size);
+    if (!new_mem)
+    {
+      _raqm_free_text (rq);
+      return false;
+    }
+
+    rq->text_capacity_bytes = mem_size;
+    rq->text = new_mem;
+  }
+
+  rq->text_info = (_raqm_text_info*)(rq->text + len);
+  rq->text_utf8 = need_utf8 ? (char*)(rq->text_info + len) : NULL;
+
+  return true;
+}
+
+static raqm_run_t*
+_raqm_alloc_run (raqm_t *rq)
+{
+  raqm_run_t *run = rq->runs_pool;
+  if (run)
+  {
+    rq->runs_pool = run->next;
+  }
+  else
+  {
+    run = malloc (sizeof (raqm_run_t));
+    run->font = NULL;
+    run->buffer = NULL;
+  }
+
+  run->pos = 0;
+  run->len = 0;
+  run->direction = HB_DIRECTION_INVALID;
+  run->script = HB_SCRIPT_INVALID;
+  run->next = NULL;
+
+  return run;
+}
+
+static void
+_raqm_free_runs (raqm_run_t *runs)
+{
+  while (runs)
+  {
+    raqm_run_t *run = runs;
+    runs = runs->next;
+
+    if (run->buffer)
+      hb_buffer_destroy (run->buffer);
+
+    if (run->font)
+      hb_font_destroy (run->font);
+
+    free (run);
+  }
+}
+
 /**
  * raqm_create:
  *
@@ -322,25 +387,25 @@ raqm_create (void)
 
   rq->ref_count = 1;
 
-  rq->text = NULL;
-  rq->text_utf8 = NULL;
-  rq->text_len = 0;
-
-  rq->text_info = NULL;
-
   rq->base_dir = RAQM_DIRECTION_DEFAULT;
   rq->resolved_dir = RAQM_DIRECTION_DEFAULT;
 
   rq->features = NULL;
   rq->features_len = 0;
 
-  rq->runs = NULL;
-  rq->glyphs = NULL;
+  rq->invisible_glyph = 0;
+
+  rq->text = NULL;
+  rq->text_utf8 = NULL;
+  rq->text_info = NULL;
+  rq->text_capacity_bytes = 0;
+  rq->text_len = 0;
 
-  rq->flags = RAQM_FLAG_NONE;
+  rq->runs = NULL;
+  rq->runs_pool = NULL;
 
-  rq->ft_loadflags = -1;
-  rq->invisible_glyph = 0;
+  rq->glyphs = NULL;
+  rq->glyphs_capacity = 0;
 
   return rq;
 }
@@ -366,28 +431,13 @@ raqm_reference (raqm_t *rq)
   return rq;
 }
 
-static void
-_raqm_free_runs (raqm_t *rq)
-{
-  raqm_run_t *runs = rq->runs;
-  while (runs)
-  {
-    raqm_run_t *run = runs;
-    runs = runs->next;
-
-    hb_buffer_destroy (run->buffer);
-    hb_font_destroy (run->font);
-    free (run);
-  }
-}
-
 /**
  * raqm_destroy:
  * @rq: a #raqm_t.
  *
  * Decreases the reference count on @rq by one. If the result is zero, then @rq
  * and all associated resources are freed.
- * See cairo_reference().
+ * See raqm_reference().
  *
  * Since: 0.1
  */
@@ -397,14 +447,60 @@ raqm_destroy (raqm_t *rq)
   if (!rq || --rq->ref_count != 0)
     return;
 
-  free (rq->text);
-  free (rq->text_utf8);
-  _raqm_free_text_info (rq);
-  _raqm_free_runs (rq);
+  _raqm_release_text_info (rq);
+  _raqm_free_text (rq);
+  _raqm_free_runs (rq->runs);
+  _raqm_free_runs (rq->runs_pool);
   free (rq->glyphs);
+  free (rq->features);
   free (rq);
 }
 
+/**
+ * raqm_clear_contents:
+ * @rq: a #raqm_t.
+ *
+ * Clears internal state of previously used raqm_t object, making it ready
+ * for reuse and keeping some of allocated memory to increase performance.
+ *
+ * Since: 0.9
+ */
+void
+raqm_clear_contents (raqm_t *rq)
+{
+  if (!rq)
+    return;
+
+  _raqm_release_text_info (rq);
+
+  /* Return allocated runs to the pool, keep hb buffers for reuse */
+  raqm_run_t *run = rq->runs;
+  while (run)
+  {
+    if (run->buffer)
+      hb_buffer_reset (run->buffer);
+
+    if (run->font)
+    {
+      hb_font_destroy (run->font);
+      run->font = NULL;
+    }
+
+    if (!run->next)
+    {
+      run->next = rq->runs_pool;
+      rq->runs_pool = rq->runs;
+      rq->runs = NULL;
+      break;
+    }
+
+    run = run->next;
+  }
+
+  rq->text_len = 0;
+  rq->resolved_dir = RAQM_DIRECTION_DEFAULT;
+}
+
 /**
  * raqm_set_text:
  * @rq: a #raqm_t.
@@ -429,23 +525,20 @@ raqm_set_text (raqm_t         *rq,
   if (!rq || !text)
     return false;
 
-  rq->text_len = len;
+  /* Call raqm_clear_contents to reuse this raqm_t */
+  if (rq->text_len)
+    return false;
 
   /* Empty string, don’t fail but do nothing */
   if (!len)
     return true;
 
-  free (rq->text);
-
-  rq->text = malloc (sizeof (uint32_t) * rq->text_len);
-  if (!rq->text)
-    return false;
-
-  _raqm_free_text_info (rq);
-  if (!_raqm_init_text_info (rq))
-    return false;
+  if (!_raqm_alloc_text(rq, len, false))
+      return false;
 
-  memcpy (rq->text, text, sizeof (uint32_t) * rq->text_len);
+  rq->text_len = len;
+  memcpy (rq->text, text, sizeof (uint32_t) * len);
+  _raqm_init_text_info (rq);
 
   return true;
 }
@@ -511,41 +604,29 @@ _raqm_u8_to_u32 (const char *text, size_t len, uint32_t *unicode)
  * Since: 0.1
  */
 bool
-raqm_set_text_utf8 (raqm_t         *rq,
-                    const char     *text,
-                    size_t          len)
+raqm_set_text_utf8 (raqm_t     *rq,
+                    const char *text,
+                    size_t      len)
 {
-  uint32_t *unicode;
-  size_t ulen;
-  bool ok;
-
   if (!rq || !text)
     return false;
 
+  /* Call raqm_clear_contents to reuse this raqm_t */
+  if (rq->text_len)
+    return false;
+
   /* Empty string, don’t fail but do nothing */
   if (!len)
-  {
-    rq->text_len = len;
     return true;
-  }
 
-  rq->flags |= RAQM_FLAG_UTF8;
-
-  rq->text_utf8 = malloc (sizeof (char) * len);
-  if (!rq->text_utf8)
-    return false;
-
-  unicode = malloc (sizeof (uint32_t) * len);
-  if (!unicode)
-    return false;
+  if (!_raqm_alloc_text(rq, len, true))
+      return false;
 
+  rq->text_len = _raqm_u8_to_u32 (text, len, rq->text);
   memcpy (rq->text_utf8, text, sizeof (char) * len);
+  _raqm_init_text_info (rq);
 
-  ulen = _raqm_u8_to_u32 (text, len, unicode);
-  ok = raqm_set_text (rq, unicode, ulen);
-
-  free (unicode);
-  return ok;
+  return true;
 }
 
 /**
@@ -561,7 +642,7 @@ raqm_set_text_utf8 (raqm_t         *rq,
  *
  * The default is #RAQM_DIRECTION_DEFAULT, which determines the paragraph
  * direction based on the first character with strong bidi type (see [rule
- * P2](http://unicode.org/reports/tr9/#P2) in Unicode Bidirectional Algorithm),
+ * P2](https://unicode.org/reports/tr9/#P2) in Unicode Bidirectional Algorithm),
  * which can be good enough for many cases but has problems when a mainly
  * right-to-left paragraph starts with a left-to-right character and vice versa
  * as the detected paragraph direction will be the wrong one, or when text does
@@ -629,7 +710,7 @@ raqm_set_language (raqm_t       *rq,
   if (!rq->text_len)
     return true;
 
-  if (rq->flags & RAQM_FLAG_UTF8)
+  if (rq->text_utf8)
   {
     start = _raqm_u8_to_u32_index (rq, start);
     end = _raqm_u8_to_u32_index (rq, end);
@@ -686,13 +767,14 @@ raqm_add_font_feature (raqm_t     *rq,
   ok = hb_feature_from_string (feature, len, &fea);
   if (ok)
   {
-    rq->features_len++;
-    rq->features = realloc (rq->features,
-                            sizeof (hb_feature_t) * (rq->features_len));
-    if (!rq->features)
+    void* new_features = realloc (rq->features,
+                                  sizeof (hb_feature_t) * (rq->features_len + 1));
+    if (!new_features)
       return false;
 
-    rq->features[rq->features_len - 1] = fea;
+    rq->features = new_features;
+    rq->features[rq->features_len] = fea;
+    rq->features_len++;
   }
 
   return ok;
@@ -700,12 +782,13 @@ raqm_add_font_feature (raqm_t     *rq,
 
 static hb_font_t *
 _raqm_create_hb_font (raqm_t *rq,
-                      FT_Face face)
+                      FT_Face face,
+                      int     loadflags)
 {
   hb_font_t *font = hb_ft_font_create_referenced (face);
 
-  if (rq->ft_loadflags >= 0)
-    hb_ft_font_set_load_flags (font, rq->ft_loadflags);
+  if (loadflags >= 0)
+    hb_ft_font_set_load_flags (font, loadflags);
 
   return font;
 }
@@ -796,7 +879,7 @@ raqm_set_freetype_face_range (raqm_t *rq,
   if (!rq->text_len)
     return true;
 
-  if (rq->flags & RAQM_FLAG_UTF8)
+  if (rq->text_utf8)
   {
     start = _raqm_u8_to_u32_index (rq, start);
     end = _raqm_u8_to_u32_index (rq, end);
@@ -805,6 +888,30 @@ raqm_set_freetype_face_range (raqm_t *rq,
   return _raqm_set_freetype_face (rq, face, start, end);
 }
 
+static bool
+_raqm_set_freetype_load_flags (raqm_t *rq,
+                               int     flags,
+                               size_t  start,
+                               size_t  end)
+{
+  if (!rq)
+    return false;
+
+  if (!rq->text_len)
+    return true;
+
+  if (start >= rq->text_len || end > rq->text_len)
+    return false;
+
+  if (!rq->text_info)
+    return false;
+
+  for (size_t i = start; i < end; i++)
+    rq->text_info[i].ftloadflags = flags;
+
+  return true;
+}
+
 /**
  * raqm_set_freetype_load_flags:
  * @rq: a #raqm_t.
@@ -823,14 +930,59 @@ raqm_set_freetype_face_range (raqm_t *rq,
  */
 bool
 raqm_set_freetype_load_flags (raqm_t *rq,
-                              int flags)
+                              int     flags)
 {
+  return _raqm_set_freetype_load_flags(rq, flags, 0, rq->text_len);
+}
+
+/**
+ * raqm_set_freetype_load_flags_range:
+ * @rq: a #raqm_t.
+ * @flags: FreeType load flags.
+ * @start: index of first character that should use @flags.
+ * @len: number of characters using @flags.
+ *
+ * Sets the load flags passed to FreeType when loading glyphs for @len-number
+ * of characters staring at @start. Flags should be the same as used by the
+ * client when rendering corresponding FreeType glyphs. The @start and @len
+ * are input string array indices (i.e. counting bytes in UTF-8 and scaler
+ * values in UTF-32).
+ *
+ * This method can be used repeatedly to set different flags for different
+ * parts of the text. It is the responsibility of the client to make sure that
+ * flag ranges cover the whole text.
+ *
+ * This requires version of HarfBuzz that has hb_ft_font_set_load_flags(), for
+ * older version the flags will be ignored.
+ *
+ * See also raqm_set_freetype_load_flags().
+ *
+ * Return value:
+ * %true if no errors happened, %false otherwise.
+ *
+ * Since: 0.9
+ */
+bool
+raqm_set_freetype_load_flags_range (raqm_t *rq,
+                                    int     flags,
+                                    size_t  start,
+                                    size_t  len)
+{
+  size_t end = start + len;
+
   if (!rq)
     return false;
 
-  rq->ft_loadflags = flags;
+  if (!rq->text_len)
+    return true;
 
-  return true;
+  if (rq->text_utf8)
+  {
+    start = _raqm_u8_to_u32_index (rq, start);
+    end = _raqm_u8_to_u32_index (rq, end);
+  }
+
+  return _raqm_set_freetype_load_flags (rq, flags, start, end);
 }
 
 /**
@@ -841,17 +993,10 @@ raqm_set_freetype_load_flags (raqm_t *rq,
  * Sets the glyph id to be used for invisible glyhphs.
  *
  * If @gid is negative, invisible glyphs will be suppressed from the output.
- * This requires HarfBuzz 1.8.0 or later. If raqm is used with an earlier
- * HarfBuzz version, the return value will be %false and the shaping behavior
- * does not change.
  *
  * If @gid is zero, invisible glyphs will be rendered as space.
- * This works on all versions of HarfBuzz.
  *
  * If @gid is a positive number, it will be used for invisible glyphs.
- * This requires a version of HarfBuzz that has
- * hb_buffer_set_invisible_glyph(). For older versions, the return value
- * will be %false and the shaping behavior does not change.
  *
  * Return value:
  * %true if no errors happened, %false otherwise.
@@ -865,17 +1010,6 @@ raqm_set_invisible_glyph (raqm_t *rq,
   if (!rq)
     return false;
 
-#ifndef HAVE_HB_BUFFER_SET_INVISIBLE_GLYPH
-  if (gid > 0)
-    return false;
-#endif
-
-#if !defined(HAVE_DECL_HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES) || \
-    !HAVE_DECL_HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES
-  if (gid < 0)
-    return false;
-#endif
-
   rq->invisible_glyph = gid;
   return true;
 }
@@ -961,18 +1095,21 @@ raqm_get_glyphs (raqm_t *rq,
   for (raqm_run_t *run = rq->runs; run != NULL; run = run->next)
     count += hb_buffer_get_length (run->buffer);
 
-  *length = count;
-
-  if (rq->glyphs)
-    free (rq->glyphs);
-
-  rq->glyphs = malloc (sizeof (raqm_glyph_t) * count);
-  if (!rq->glyphs)
+  if (count > rq->glyphs_capacity)
   {
-    *length = 0;
-    return NULL;
+    void* new_mem = realloc (rq->glyphs, sizeof (raqm_glyph_t) * count);
+    if (!new_mem)
+    {
+      *length = 0;
+      return NULL;
+    }
+
+    rq->glyphs = new_mem;
+    rq->glyphs_capacity = count;
   }
 
+  *length = count;
+
   RAQM_TEST ("Glyph information:\n");
 
   count = 0;
@@ -1005,7 +1142,7 @@ raqm_get_glyphs (raqm_t *rq,
     count += len;
   }
 
-  if (rq->flags & RAQM_FLAG_UTF8)
+  if (rq->text_utf8)
   {
 #ifdef RAQM_TESTING
     RAQM_TEST ("\nUTF-32 clusters:");
@@ -1276,24 +1413,14 @@ _raqm_bidi_itemize (raqm_t *rq, size_t *run_count)
   FriBidiCharType *types;
   _raqm_bidi_level_t *levels;
   int max_level = 0;
-#ifdef USE_FRIBIDI_EX_API
   FriBidiBracketType *btypes;
-#endif
 
   types = calloc (rq->text_len, sizeof (FriBidiCharType));
-#ifdef USE_FRIBIDI_EX_API
   btypes = calloc (rq->text_len, sizeof (FriBidiBracketType));
-#endif
   levels = calloc (rq->text_len, sizeof (_raqm_bidi_level_t));
 
-  if (!types || !levels
-#ifdef USE_FRIBIDI_EX_API
-      || !btypes
-#endif
-      )
-  {
+  if (!types || !levels || !btypes)
     goto done;
-  }
 
   if (rq->base_dir == RAQM_DIRECTION_RTL)
     par_type = FRIBIDI_PAR_RTL;
@@ -1301,15 +1428,10 @@ _raqm_bidi_itemize (raqm_t *rq, size_t *run_count)
     par_type = FRIBIDI_PAR_LTR;
 
   fribidi_get_bidi_types (rq->text, rq->text_len, types);
-#ifdef USE_FRIBIDI_EX_API
   fribidi_get_bracket_types (rq->text, rq->text_len, types, btypes);
   max_level = fribidi_get_par_embedding_levels_ex (types, btypes,
                                                    rq->text_len, &par_type,
                                                    levels);
-#else
-  max_level = fribidi_get_par_embedding_levels (types, rq->text_len,
-                                                &par_type, levels);
-#endif
 
   if (par_type == FRIBIDI_PAR_LTR)
     rq->resolved_dir = RAQM_DIRECTION_LTR;
@@ -1325,9 +1447,7 @@ _raqm_bidi_itemize (raqm_t *rq, size_t *run_count)
 done:
   free (types);
   free (levels);
-#ifdef USE_FRIBIDI_EX_API
   free (btypes);
-#endif
 
   return runs;
 }
@@ -1403,7 +1523,7 @@ _raqm_itemize (raqm_t *rq)
   last = NULL;
   for (size_t i = 0; i < run_count; i++)
   {
-    raqm_run_t *run = calloc (1, sizeof (raqm_run_t));
+    raqm_run_t *run = _raqm_alloc_run (rq);
     if (!run)
     {
       ok = false;
@@ -1422,13 +1542,14 @@ _raqm_itemize (raqm_t *rq)
     {
       run->pos = runs[i].pos + runs[i].len - 1;
       run->script = rq->text_info[run->pos].script;
-      run->font = _raqm_create_hb_font (rq, rq->text_info[run->pos].ftface);
+      run->font = _raqm_create_hb_font (rq, rq->text_info[run->pos].ftface,
+          rq->text_info[run->pos].ftloadflags);
       for (int j = runs[i].len - 1; j >= 0; j--)
       {
         _raqm_text_info info = rq->text_info[runs[i].pos + j];
         if (!_raqm_compare_text_info (rq->text_info[run->pos], info))
         {
-          raqm_run_t *newrun = calloc (1, sizeof (raqm_run_t));
+          raqm_run_t *newrun = _raqm_alloc_run (rq);
           if (!newrun)
           {
             ok = false;
@@ -1438,7 +1559,8 @@ _raqm_itemize (raqm_t *rq)
           newrun->len = 1;
           newrun->direction = _raqm_hb_dir (rq, runs[i].level);
           newrun->script = info.script;
-          newrun->font = _raqm_create_hb_font (rq, info.ftface);
+          newrun->font = _raqm_create_hb_font (rq, info.ftface,
+              info.ftloadflags);
           run->next = newrun;
           run = newrun;
         }
@@ -1453,13 +1575,14 @@ _raqm_itemize (raqm_t *rq)
     {
       run->pos = runs[i].pos;
       run->script = rq->text_info[run->pos].script;
-      run->font = _raqm_create_hb_font (rq, rq->text_info[run->pos].ftface);
+      run->font = _raqm_create_hb_font (rq, rq->text_info[run->pos].ftface,
+          rq->text_info[run->pos].ftloadflags);
       for (size_t j = 0; j < runs[i].len; j++)
       {
         _raqm_text_info info = rq->text_info[runs[i].pos + j];
         if (!_raqm_compare_text_info (rq->text_info[run->pos], info))
         {
-          raqm_run_t *newrun = calloc (1, sizeof (raqm_run_t));
+          raqm_run_t *newrun = _raqm_alloc_run (rq);
           if (!newrun)
           {
             ok = false;
@@ -1469,7 +1592,8 @@ _raqm_itemize (raqm_t *rq)
           newrun->len = 1;
           newrun->direction = _raqm_hb_dir (rq, runs[i].level);
           newrun->script = info.script;
-          newrun->font = _raqm_create_hb_font (rq, info.ftface);
+          newrun->font = _raqm_create_hb_font (rq, info.ftface,
+              info.ftloadflags);
           run->next = newrun;
           run = newrun;
         }
@@ -1758,7 +1882,6 @@ _raqm_resolve_scripts (raqm_t *rq)
   return true;
 }
 
-#ifdef HAVE_FT_GET_TRANSFORM
 static void
 _raqm_ft_transform (int      *x,
                     int      *y,
@@ -1773,22 +1896,19 @@ _raqm_ft_transform (int      *x,
   *x = vector.x;
   *y = vector.y;
 }
-#endif
 
 static bool
 _raqm_shape (raqm_t *rq)
 {
   hb_buffer_flags_t hb_buffer_flags = HB_BUFFER_FLAG_BOT | HB_BUFFER_FLAG_EOT;
 
-#if defined(HAVE_DECL_HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES) && \
-    HAVE_DECL_HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES
   if (rq->invisible_glyph < 0)
     hb_buffer_flags |= HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES;
-#endif
 
   for (raqm_run_t *run = rq->runs; run != NULL; run = run->next)
   {
-    run->buffer = hb_buffer_create ();
+    if (!run->buffer)
+      run->buffer = hb_buffer_create ();
 
     hb_buffer_add_utf32 (run->buffer, rq->text, rq->text_len,
                          run->pos, run->len);
@@ -1797,15 +1917,12 @@ _raqm_shape (raqm_t *rq)
     hb_buffer_set_direction (run->buffer, run->direction);
     hb_buffer_set_flags (run->buffer, hb_buffer_flags);
 
-#ifdef HAVE_HB_BUFFER_SET_INVISIBLE_GLYPH
     if (rq->invisible_glyph > 0)
       hb_buffer_set_invisible_glyph (run->buffer, rq->invisible_glyph);
-#endif
 
     hb_shape_full (run->font, run->buffer, rq->features, rq->features_len,
                    NULL);
 
-#ifdef HAVE_FT_GET_TRANSFORM
     {
       FT_Matrix matrix;
       hb_glyph_position_t *pos;
@@ -1819,7 +1936,6 @@ _raqm_shape (raqm_t *rq)
         _raqm_ft_transform (&pos[i].x_offset, &pos[i].y_offset, matrix);
       }
     }
-#endif
   }
 
   return true;
@@ -1917,7 +2033,7 @@ raqm_index_to_position (raqm_t *rq,
   if (rq == NULL)
     return false;
 
-  if (rq->flags & RAQM_FLAG_UTF8)
+  if (rq->text_utf8)
     *index = _raqm_u8_to_u32_index (rq, *index);
 
   if (*index >= rq->text_len)
@@ -1974,7 +2090,7 @@ raqm_index_to_position (raqm_t *rq,
   }
 
 found:
-  if (rq->flags & RAQM_FLAG_UTF8)
+  if (rq->text_utf8)
     *index = _raqm_u32_to_u8_index (rq, *index);
   RAQM_TEST ("The position is %d at index %zu\n",*x ,*index);
   return true;
diff --git a/src/thirdparty/raqm/raqm.h b/src/thirdparty/raqm/raqm.h
index faab855915a..bdb5a50d884 100644
--- a/src/thirdparty/raqm/raqm.h
+++ b/src/thirdparty/raqm/raqm.h
@@ -1,6 +1,6 @@
 /*
  * Copyright © 2015 Information Technology Authority (ITA) <foss@ita.gov.om>
- * Copyright © 2016-2021 Khaled Hosny <khaled@aliftype.com>
+ * Copyright © 2016-2022 Khaled Hosny <khaled@aliftype.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -106,6 +106,9 @@ raqm_reference (raqm_t *rq);
 RAQM_API void
 raqm_destroy (raqm_t *rq);
 
+RAQM_API void
+raqm_clear_contents (raqm_t *rq);
+
 RAQM_API bool
 raqm_set_text (raqm_t         *rq,
                const uint32_t *text,
@@ -145,6 +148,12 @@ RAQM_API bool
 raqm_set_freetype_load_flags (raqm_t *rq,
                               int flags);
 
+RAQM_API bool
+raqm_set_freetype_load_flags_range (raqm_t *rq,
+                                    int     flags,
+                                    size_t  start,
+                                    size_t  len);
+
 RAQM_API bool
 raqm_set_invisible_glyph (raqm_t *rq,
                           int gid);

From 7640e3b50b1bf6bba74e1298d8bd45fff9cf27a0 Mon Sep 17 00:00:00 2001
From: nulano <nulano@nulano.eu>
Date: Mon, 31 Jan 2022 00:11:47 +0000
Subject: [PATCH 06/23] Revert "detect FreeType / HarfBuzz features"

This reverts commit 6565d13275cead21dc6f369204f0dc3d0b43bc18.
---
 src/thirdparty/raqm/raqm.c | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/src/thirdparty/raqm/raqm.c b/src/thirdparty/raqm/raqm.c
index f852542b43e..13f6e1f023c 100644
--- a/src/thirdparty/raqm/raqm.c
+++ b/src/thirdparty/raqm/raqm.c
@@ -42,21 +42,6 @@
 #include <hb.h>
 #include <hb-ft.h>
 
-#if FREETYPE_MAJOR > 2 || \
-    FREETYPE_MAJOR == 2 && FREETYPE_MINOR >= 11
-#define HAVE_FT_GET_TRANSFORM
-#endif
-
-#if HB_VERSION_ATLEAST(2, 0, 0)
-#define HAVE_HB_BUFFER_SET_INVISIBLE_GLYPH
-#endif
-
-#if HB_VERSION_ATLEAST(1, 8, 0)
-#define HAVE_DECL_HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES 1
-#else
-#define HAVE_DECL_HB_BUFFER_FLAG_REMOVE_DEFAULT_IGNORABLES 0
-#endif
-
 #include "raqm.h"
 
 /**

From 16c0d48740740f0ee220a3cb58423b594e930727 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 31 Jan 2022 18:56:52 +0200
Subject: [PATCH 07/23] Fix lcms2 URL

---
 winbuild/build_prepare.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 78916987c34..182146fbc57 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -219,7 +219,7 @@ def cmd_msbuild(
         # "bins": [r"objs\{msbuild_arch}\Release\freetype.dll"],
     },
     "lcms2": {
-        "url": SF_MIRROR + "/project/lcms/lcms/2.12/lcms2-2.13.tar.gz",
+        "url": SF_MIRROR + "/project/lcms/lcms/2.13/lcms2-2.13.tar.gz",
         "filename": "lcms2-2.13.tar.gz",
         "dir": "lcms2-2.13",
         "patch": {

From eb0588522045f8071a35c5a42c9e472cfa9be29a Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 31 Jan 2022 20:38:47 +0200
Subject: [PATCH 08/23] Update harfbuzz to 3.3.0

---
 winbuild/build_prepare.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 182146fbc57..347096717b1 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -278,9 +278,9 @@ def cmd_msbuild(
         "libs": [r"imagequant.lib"],
     },
     "harfbuzz": {
-        "url": "https://github.com/harfbuzz/harfbuzz/archive/3.2.0.zip",
-        "filename": "harfbuzz-3.2.0.zip",
-        "dir": "harfbuzz-3.2.0",
+        "url": "https://github.com/harfbuzz/harfbuzz/archive/3.3.0.zip",
+        "filename": "harfbuzz-3.3.0.zip",
+        "dir": "harfbuzz-3.3.0",
         "build": [
             cmd_cmake("-DHB_HAVE_FREETYPE:BOOL=TRUE"),
             cmd_nmake(target="clean"),

From 4d8d871f5e5e82a9bc951a2083b2fee87a984554 Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 31 Jan 2022 23:27:35 +0200
Subject: [PATCH 09/23] Update harfbuzz to 3.3.1

---
 winbuild/build_prepare.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 347096717b1..4d9f7921131 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -278,9 +278,9 @@ def cmd_msbuild(
         "libs": [r"imagequant.lib"],
     },
     "harfbuzz": {
-        "url": "https://github.com/harfbuzz/harfbuzz/archive/3.3.0.zip",
-        "filename": "harfbuzz-3.3.0.zip",
-        "dir": "harfbuzz-3.3.0",
+        "url": "https://github.com/harfbuzz/harfbuzz/archive/3.3.1.zip",
+        "filename": "harfbuzz-3.3.1.zip",
+        "dir": "harfbuzz-3.3.1",
         "build": [
             cmd_cmake("-DHB_HAVE_FREETYPE:BOOL=TRUE"),
             cmd_nmake(target="clean"),

From 0fa00f9623b762de58686fc8863f26bcb7de21df Mon Sep 17 00:00:00 2001
From: Hugo van Kemenade <hugovk@users.noreply.github.com>
Date: Mon, 31 Jan 2022 23:41:16 +0200
Subject: [PATCH 10/23] Remove EOL CentOS 8

---
 .github/workflows/test-docker.yml | 1 -
 docs/installation.rst             | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
index df04d0a6cae..656df5e913c 100644
--- a/.github/workflows/test-docker.yml
+++ b/.github/workflows/test-docker.yml
@@ -19,7 +19,6 @@ jobs:
           amazon-2-amd64,
           arch,
           centos-7-amd64,
-          centos-8-amd64,
           centos-stream-8-amd64,
           debian-10-buster-x86,
           debian-11-bullseye-x86,
diff --git a/docs/installation.rst b/docs/installation.rst
index 88aaf58341d..984a689c2fb 100644
--- a/docs/installation.rst
+++ b/docs/installation.rst
@@ -453,8 +453,6 @@ These platforms are built and tested for every change.
 +----------------------------------+----------------------------+---------------------+
 | CentOS 7                         | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
-| CentOS 8                         | 3.9                        | x86-64              |
-+----------------------------------+----------------------------+---------------------+
 | CentOS Stream 8                  | 3.9                        | x86-64              |
 +----------------------------------+----------------------------+---------------------+
 | Debian 10 Buster                 | 3.7                        | x86                 |
@@ -530,6 +528,8 @@ These platforms have been reported to work at the versions mentioned.
 +----------------------------------+---------------------------+------------------+--------------+
 | CentOS 6.3                       | 2.7, 3.3                  |                  |x86           |
 +----------------------------------+---------------------------+------------------+--------------+
+| CentOS 8                         | 3.9                       | 9.0.0            |x86-64        |
++----------------------------------+---------------------------+------------------+--------------+
 | Fedora 23                        | 2.7, 3.4                  | 3.1.0            |x86-64        |
 +----------------------------------+---------------------------+------------------+--------------+
 | Ubuntu Linux 12.04 LTS (Precise) | | 2.6, 3.2, 3.3, 3.4, 3.5 | 3.4.1            |x86,x86-64    |

From eada1c931a7de137de6e62da57fea5765ca22813 Mon Sep 17 00:00:00 2001
From: Gabor Kertesz <gabor.kertesz@linaro.org>
Date: Fri, 29 Oct 2021 12:31:40 +0200
Subject: [PATCH 11/23] Windows: Enable ARM64 for MSVC

This patch enables ARM64 as a new platform for Windows.
Platform query and documentation is updated accordingly.
---
 winbuild/build.rst        | 6 +++---
 winbuild/build_prepare.py | 7 ++++++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/winbuild/build.rst b/winbuild/build.rst
index b30a94226d7..661c5a5ecea 100644
--- a/winbuild/build.rst
+++ b/winbuild/build.rst
@@ -24,7 +24,7 @@ Download and install:
 * `CMake 3.12 or newer <https://cmake.org/download/>`_
   (also available as Visual Studio component C++ CMake tools for Windows)
 
-* `NASM <https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D>`_
+* x86/x64: `NASM <https://www.nasm.us/pub/nasm/releasebuilds/?C=M;O=D>`_
 
 Any version of Visual Studio 2017 or newer should be supported,
 including Visual Studio 2017 Community, or Build Tools for Visual Studio 2019.
@@ -42,8 +42,8 @@ behaviour of ``build_prepare.py``:
   If ``PYTHON`` is unset, the version of Python used to run
   ``build_prepare.py`` will be used. If only ``PYTHON`` is set,
   ``EXECUTABLE`` defaults to ``python.exe``.
-* ``ARCHITECTURE`` is used to select a ``x86`` or ``x64`` build. By default,
-  uses same architecture as the version of Python used to run ``build_prepare.py``.
+* ``ARCHITECTURE`` is used to select a ``x86``, ``x64`` or ``ARM64``build.
+  By default, uses same architecture as the version of Python used to run ``build_prepare.py``.
   is used.
 * ``PILLOW_BUILD`` can be used to override the ``winbuild\build`` directory
   path, used to store generated build scripts and compiled libraries.
diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index 4d9f7921131..bebafff9f88 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -1,4 +1,5 @@
 import os
+import platform
 import shutil
 import struct
 import subprocess
@@ -93,6 +94,7 @@ def cmd_msbuild(
 architectures = {
     "x86": {"vcvars_arch": "x86", "msbuild_arch": "Win32"},
     "x64": {"vcvars_arch": "x86_amd64", "msbuild_arch": "x64"},
+    "ARM64": {"vcvars_arch": "x86_arm64", "msbuild_arch": "ARM64"},
 }
 
 header = [
@@ -490,7 +492,10 @@ def build_pillow():
     python_dir = os.environ.get("PYTHON")
     python_exe = os.environ.get("EXECUTABLE", "python.exe")
     architecture = os.environ.get(
-        "ARCHITECTURE", "x86" if struct.calcsize("P") == 4 else "x64"
+        "ARCHITECTURE",
+        "ARM64"
+        if platform.machine() == "ARM64"
+        else ("x86" if struct.calcsize("P") == 4 else "x64"),
     )
     build_dir = os.environ.get("PILLOW_BUILD", os.path.join(winbuild_dir, "build"))
     sources_dir = ""

From ba226226a774499814e5945c7d7ca2bb51dea701 Mon Sep 17 00:00:00 2001
From: Gabor Kertesz <gabor.kertesz@arm.com>
Date: Fri, 29 Oct 2021 12:20:56 +0200
Subject: [PATCH 12/23] lcms2: Update to VS2019

In order to enable win-arm64, VS2019 should be used, while other
platforms should work with newer version as well.
Tested on x64-win10.
---
 winbuild/build_prepare.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
index bebafff9f88..01f1bac298b 100644
--- a/winbuild/build_prepare.py
+++ b/winbuild/build_prepare.py
@@ -225,21 +225,21 @@ def cmd_msbuild(
         "filename": "lcms2-2.13.tar.gz",
         "dir": "lcms2-2.13",
         "patch": {
-            r"Projects\VC2017\lcms2_static\lcms2_static.vcxproj": {
+            r"Projects\VC2019\lcms2_static\lcms2_static.vcxproj": {
                 # default is /MD for x86 and /MT for x64, we need /MD always
                 "<RuntimeLibrary>MultiThreaded</RuntimeLibrary>": "<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>",  # noqa: E501
                 # retarget to default toolset (selected by vcvarsall.bat)
-                "<PlatformToolset>v141</PlatformToolset>": "<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>",  # noqa: E501
+                "<PlatformToolset>v142</PlatformToolset>": "<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>",  # noqa: E501
                 # retarget to latest (selected by vcvarsall.bat)
-                "<WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>": "<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>",  # noqa: E501
+                "<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>": "<WindowsTargetPlatformVersion>$(WindowsSDKVersion)</WindowsTargetPlatformVersion>",  # noqa: E501
             }
         },
         "build": [
             cmd_rmdir("Lib"),
-            cmd_rmdir(r"Projects\VC2017\Release"),
-            cmd_msbuild(r"Projects\VC2017\lcms2.sln", "Release", "Clean"),
+            cmd_rmdir(r"Projects\VC2019\Release"),
+            cmd_msbuild(r"Projects\VC2019\lcms2.sln", "Release", "Clean"),
             cmd_msbuild(
-                r"Projects\VC2017\lcms2.sln", "Release", "lcms2_static:Rebuild"
+                r"Projects\VC2019\lcms2.sln", "Release", "lcms2_static:Rebuild"
             ),
             cmd_xcopy("include", "{inc_dir}"),
         ],

From 820362100ab031dea2505b7858179391b9dfa59f Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 2 Feb 2022 14:33:19 +1100
Subject: [PATCH 13/23] Update CHANGES.rst [ci skip]

---
 CHANGES.rst | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index d6cd9d50f21..66d41739330 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,12 @@ Changelog (Pillow)
 9.1.0 (unreleased)
 ------------------
 
+- Enable arm64 for MSVC on Windows #5811
+  [gaborkertesz-linaro, gaborkertesz]
+
+- Keep IPython/Jupyter text/plain output stable #5891
+  [shamrin, radarhere]
+
 - Raise an error when performing a negative crop #5972
   [radarhere, hugovk]
 

From 6c90ee1049c178b608d91d4a5c9529ea9f479a9d Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Wed, 2 Feb 2022 11:49:31 +1100
Subject: [PATCH 14/23] Improved consistency of returning an image access
 object from load()

---
 Tests/test_file_eps.py     |  9 +++++++++
 Tests/test_file_gbr.py     | 22 +++++++++++++++-------
 Tests/test_file_icns.py    |  8 ++++++++
 Tests/test_file_ico.py     |  5 +++++
 Tests/test_file_wal.py     | 16 ++++++++++------
 Tests/test_file_wmf.py     |  6 ++++++
 src/PIL/EpsImagePlugin.py  | 12 ++++++------
 src/PIL/GbrImagePlugin.py  | 10 ++++------
 src/PIL/IcnsImagePlugin.py |  9 +++++----
 src/PIL/IcoImagePlugin.py  |  2 +-
 src/PIL/ImageFile.py       |  1 +
 src/PIL/WalImageFile.py    | 13 +++++--------
 src/PIL/WmfImagePlugin.py  |  2 +-
 13 files changed, 76 insertions(+), 39 deletions(-)

diff --git a/Tests/test_file_eps.py b/Tests/test_file_eps.py
index 4c0b96f7376..1790f4f7701 100644
--- a/Tests/test_file_eps.py
+++ b/Tests/test_file_eps.py
@@ -58,6 +58,15 @@ def test_sanity():
         assert image2_scale2.format == "EPS"
 
 
+@pytest.mark.skipif(not HAS_GHOSTSCRIPT, reason="Ghostscript not available")
+def test_load():
+    with Image.open(FILE1) as im:
+        assert im.load()[0, 0] == (255, 255, 255)
+
+        # Test again now that it has already been loaded once
+        assert im.load()[0, 0] == (255, 255, 255)
+
+
 def test_invalid_file():
     invalid_file = "Tests/images/flower.jpg"
 
diff --git a/Tests/test_file_gbr.py b/Tests/test_file_gbr.py
index 8d7fcf14779..1ea8af8ee34 100644
--- a/Tests/test_file_gbr.py
+++ b/Tests/test_file_gbr.py
@@ -5,20 +5,28 @@
 from .helper import assert_image_equal_tofile
 
 
-def test_invalid_file():
-    invalid_file = "Tests/images/flower.jpg"
-
-    with pytest.raises(SyntaxError):
-        GbrImagePlugin.GbrImageFile(invalid_file)
-
-
 def test_gbr_file():
     with Image.open("Tests/images/gbr.gbr") as im:
         assert_image_equal_tofile(im, "Tests/images/gbr.png")
 
 
+def test_load():
+    with Image.open("Tests/images/gbr.gbr") as im:
+        assert im.load()[0, 0] == (0, 0, 0, 0)
+
+        # Test again now that it has already been loaded once
+        assert im.load()[0, 0] == (0, 0, 0, 0)
+
+
 def test_multiple_load_operations():
     with Image.open("Tests/images/gbr.gbr") as im:
         im.load()
         im.load()
         assert_image_equal_tofile(im, "Tests/images/gbr.png")
+
+
+def test_invalid_file():
+    invalid_file = "Tests/images/flower.jpg"
+
+    with pytest.raises(SyntaxError):
+        GbrImagePlugin.GbrImageFile(invalid_file)
diff --git a/Tests/test_file_icns.py b/Tests/test_file_icns.py
index 3afbbeaac05..b492f6cb227 100644
--- a/Tests/test_file_icns.py
+++ b/Tests/test_file_icns.py
@@ -28,6 +28,14 @@ def test_sanity():
         assert im.format == "ICNS"
 
 
+def test_load():
+    with Image.open(TEST_FILE) as im:
+        assert im.load()[0, 0] == (0, 0, 0, 0)
+
+        # Test again now that it has already been loaded once
+        assert im.load()[0, 0] == (0, 0, 0, 0)
+
+
 def test_save(tmp_path):
     temp_file = str(tmp_path / "temp.icns")
 
diff --git a/Tests/test_file_ico.py b/Tests/test_file_ico.py
index 317264db646..73ac6f74286 100644
--- a/Tests/test_file_ico.py
+++ b/Tests/test_file_ico.py
@@ -18,6 +18,11 @@ def test_sanity():
     assert im.get_format_mimetype() == "image/x-icon"
 
 
+def test_load():
+    with Image.open(TEST_ICO_FILE) as im:
+        assert im.load()[0, 0] == (1, 1, 9, 255)
+
+
 def test_mask():
     with Image.open("Tests/images/hopper_mask.ico") as im:
         assert_image_equal_tofile(im, "Tests/images/hopper_mask.png")
diff --git a/Tests/test_file_wal.py b/Tests/test_file_wal.py
index f25b42fe0c4..4be46e9d673 100644
--- a/Tests/test_file_wal.py
+++ b/Tests/test_file_wal.py
@@ -2,15 +2,11 @@
 
 from .helper import assert_image_equal_tofile
 
+TEST_FILE = "Tests/images/hopper.wal"
 
-def test_open():
-    # Arrange
-    TEST_FILE = "Tests/images/hopper.wal"
 
-    # Act
+def test_open():
     with WalImageFile.open(TEST_FILE) as im:
-
-        # Assert
         assert im.format == "WAL"
         assert im.format_description == "Quake2 Texture"
         assert im.mode == "P"
@@ -19,3 +15,11 @@ def test_open():
         assert isinstance(im, WalImageFile.WalImageFile)
 
         assert_image_equal_tofile(im, "Tests/images/hopper_wal.png")
+
+
+def test_load():
+    with WalImageFile.open(TEST_FILE) as im:
+        assert im.load()[0, 0] == 122
+
+        # Test again now that it has already been loaded once
+        assert im.load()[0, 0] == 122
diff --git a/Tests/test_file_wmf.py b/Tests/test_file_wmf.py
index 3f8bc96ccdd..d6769a24b0b 100644
--- a/Tests/test_file_wmf.py
+++ b/Tests/test_file_wmf.py
@@ -24,6 +24,12 @@ def test_load_raw():
             assert_image_similar_tofile(im, "Tests/images/drawing_wmf_ref.png", 2.0)
 
 
+def test_load():
+    with Image.open("Tests/images/drawing.emf") as im:
+        if hasattr(Image.core, "drawwmf"):
+            assert im.load()[0, 0] == (255, 255, 255)
+
+
 def test_register_handler(tmp_path):
     class TestHandler:
         methodCalled = False
diff --git a/src/PIL/EpsImagePlugin.py b/src/PIL/EpsImagePlugin.py
index 5d99202807e..b67363beb53 100644
--- a/src/PIL/EpsImagePlugin.py
+++ b/src/PIL/EpsImagePlugin.py
@@ -329,12 +329,12 @@ def _find_offset(self, fp):
 
     def load(self, scale=1, transparency=False):
         # Load EPS via Ghostscript
-        if not self.tile:
-            return
-        self.im = Ghostscript(self.tile, self.size, self.fp, scale, transparency)
-        self.mode = self.im.mode
-        self._size = self.im.size
-        self.tile = []
+        if self.tile:
+            self.im = Ghostscript(self.tile, self.size, self.fp, scale, transparency)
+            self.mode = self.im.mode
+            self._size = self.im.size
+            self.tile = []
+        return Image.Image.load(self)
 
     def load_seek(self, *args, **kwargs):
         # we can't incrementally load, so force ImageFile.parser to
diff --git a/src/PIL/GbrImagePlugin.py b/src/PIL/GbrImagePlugin.py
index 0f230602db8..3d8fc47b224 100644
--- a/src/PIL/GbrImagePlugin.py
+++ b/src/PIL/GbrImagePlugin.py
@@ -84,12 +84,10 @@ def _open(self):
         self._data_size = width * height * color_depth
 
     def load(self):
-        if self.im:
-            # Already loaded
-            return
-
-        self.im = Image.core.new(self.mode, self.size)
-        self.frombytes(self.fp.read(self._data_size))
+        if not self.im:
+            self.im = Image.core.new(self.mode, self.size)
+            self.frombytes(self.fp.read(self._data_size))
+        return Image.Image.load(self)
 
 
 #
diff --git a/src/PIL/IcnsImagePlugin.py b/src/PIL/IcnsImagePlugin.py
index 6412d1cfb4b..069aff96b63 100644
--- a/src/PIL/IcnsImagePlugin.py
+++ b/src/PIL/IcnsImagePlugin.py
@@ -286,21 +286,22 @@ def load(self):
                 self.best_size[1] * self.best_size[2],
             )
 
-        Image.Image.load(self)
+        px = Image.Image.load(self)
         if self.im and self.im.size == self.size:
             # Already loaded
-            return
+            return px
         self.load_prepare()
         # This is likely NOT the best way to do it, but whatever.
         im = self.icns.getimage(self.best_size)
 
         # If this is a PNG or JPEG 2000, it won't be loaded yet
-        im.load()
+        px = im.load()
 
         self.im = im.im
         self.mode = im.mode
         self.size = im.size
-        self.load_end()
+
+        return px
 
 
 def _save(im, fp, filename):
diff --git a/src/PIL/IcoImagePlugin.py b/src/PIL/IcoImagePlugin.py
index d9ff9b5e731..82837f3073f 100644
--- a/src/PIL/IcoImagePlugin.py
+++ b/src/PIL/IcoImagePlugin.py
@@ -306,7 +306,7 @@ def size(self, value):
     def load(self):
         if self.im and self.im.size == self.size:
             # Already loaded
-            return
+            return Image.Image.load(self)
         im = self.ico.getimage(self.size)
         # if tile is PNG, it won't really be loaded yet
         im.load()
diff --git a/src/PIL/ImageFile.py b/src/PIL/ImageFile.py
index 3374a5b1dae..331410f0e1a 100644
--- a/src/PIL/ImageFile.py
+++ b/src/PIL/ImageFile.py
@@ -328,6 +328,7 @@ def load(self):
         # become the other object (!)
         self.__class__ = image.__class__
         self.__dict__ = image.__dict__
+        return image.load()
 
     def _load(self):
         """(Hook) Find actual image loader."""
diff --git a/src/PIL/WalImageFile.py b/src/PIL/WalImageFile.py
index 1354ad32b52..0dc695a88d4 100644
--- a/src/PIL/WalImageFile.py
+++ b/src/PIL/WalImageFile.py
@@ -51,14 +51,11 @@ def _open(self):
             self.info["next_name"] = next_name
 
     def load(self):
-        if self.im:
-            # Already loaded
-            return
-
-        self.im = Image.core.new(self.mode, self.size)
-        self.frombytes(self.fp.read(self.size[0] * self.size[1]))
-        self.putpalette(quake2palette)
-        Image.Image.load(self)
+        if not self.im:
+            self.im = Image.core.new(self.mode, self.size)
+            self.frombytes(self.fp.read(self.size[0] * self.size[1]))
+            self.putpalette(quake2palette)
+        return Image.Image.load(self)
 
 
 def open(filename):
diff --git a/src/PIL/WmfImagePlugin.py b/src/PIL/WmfImagePlugin.py
index 27f5d2f870c..c32cc52f8d0 100644
--- a/src/PIL/WmfImagePlugin.py
+++ b/src/PIL/WmfImagePlugin.py
@@ -158,7 +158,7 @@ def load(self, dpi=None):
                 (x1 - x0) * self.info["dpi"] // self._inch,
                 (y1 - y0) * self.info["dpi"] // self._inch,
             )
-        super().load()
+        return super().load()
 
 
 def _save(im, fp, filename):

From 9675673d4877bdcda3e211579e8b42f9ce72b150 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 10 Jan 2022 21:49:55 +1100
Subject: [PATCH 15/23] Restrict builtins within lambdas for ImageMath.eval

---
 Tests/test_imagemath.py | 12 ++++++++++--
 src/PIL/ImageMath.py    | 15 +++++++++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Tests/test_imagemath.py b/Tests/test_imagemath.py
index 25811aa89d7..39d91eadea6 100644
--- a/Tests/test_imagemath.py
+++ b/Tests/test_imagemath.py
@@ -52,9 +52,17 @@ def test_ops():
     assert pixel(ImageMath.eval("float(B)**33", images)) == "F 8589934592.0"
 
 
-def test_prevent_exec():
+@pytest.mark.parametrize(
+    "expression",
+    (
+        "exec('pass')",
+        "(lambda: exec('pass'))()",
+        "(lambda: (lambda: exec('pass'))())()",
+    ),
+)
+def test_prevent_exec(expression):
     with pytest.raises(ValueError):
-        ImageMath.eval("exec('pass')")
+        ImageMath.eval(expression)
 
 
 def test_logical():
diff --git a/src/PIL/ImageMath.py b/src/PIL/ImageMath.py
index 4b6e4ccda3a..09d9898d750 100644
--- a/src/PIL/ImageMath.py
+++ b/src/PIL/ImageMath.py
@@ -240,11 +240,18 @@ def eval(expression, _dict={}, **kw):
         if hasattr(v, "im"):
             args[k] = _Operand(v)
 
-    code = compile(expression, "<string>", "eval")
-    for name in code.co_names:
-        if name not in args and name != "abs":
-            raise ValueError(f"'{name}' not allowed")
+    compiled_code = compile(expression, "<string>", "eval")
 
+    def scan(code):
+        for const in code.co_consts:
+            if type(const) == type(compiled_code):
+                scan(const)
+
+        for name in code.co_names:
+            if name not in args and name != "abs":
+                raise ValueError(f"'{name}' not allowed")
+
+    scan(compiled_code)
     out = builtins.eval(expression, {"__builtins": {"abs": abs}}, args)
     try:
         return out.im

From 63d3179c12ec6ee70dfad4159a618c13b0245184 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 17 Jan 2022 08:59:17 +1100
Subject: [PATCH 16/23] In show_file, use os.remove to remove temporary images

---
 Tests/test_imageshow.py |   6 +-
 src/PIL/ImageShow.py    | 145 +++++++++++++++++++++++++++++++---------
 2 files changed, 119 insertions(+), 32 deletions(-)

diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py
index 02edfdfa1f7..bf19a603362 100644
--- a/Tests/test_imageshow.py
+++ b/Tests/test_imageshow.py
@@ -85,11 +85,13 @@ def test_ipythonviewer():
     not on_ci() or is_win32(),
     reason="Only run on CIs; hangs on Windows CIs",
 )
-def test_file_deprecated():
+def test_file_deprecated(tmp_path):
+    f = str(tmp_path / "temp.jpg")
     for viewer in ImageShow._viewers:
+        hopper().save(f)
         with pytest.warns(DeprecationWarning):
             try:
-                viewer.show_file(file="test.jpg")
+                viewer.show_file(file=f)
             except NotImplementedError:
                 pass
         with pytest.raises(TypeError):
diff --git a/src/PIL/ImageShow.py b/src/PIL/ImageShow.py
index 2165da30732..7212baa1cb1 100644
--- a/src/PIL/ImageShow.py
+++ b/src/PIL/ImageShow.py
@@ -15,7 +15,6 @@
 import shutil
 import subprocess
 import sys
-import tempfile
 import warnings
 from shlex import quote
 
@@ -180,16 +179,15 @@ def show_file(self, path=None, **options):
                 path = options.pop("file")
             else:
                 raise TypeError("Missing required argument: 'path'")
-        fd, temp_path = tempfile.mkstemp()
-        with os.fdopen(fd, "w") as f:
-            f.write(path)
-        with open(temp_path) as f:
-            subprocess.Popen(
-                ["im=$(cat); open -a Preview.app $im; sleep 20; rm -f $im"],
-                shell=True,
-                stdin=f,
-            )
-        os.remove(temp_path)
+        subprocess.call(["open", "-a", "Preview.app", path])
+        subprocess.Popen(
+            [
+                sys.executable,
+                "-c",
+                "import os, sys, time;time.sleep(20);os.remove(sys.argv[1])",
+                path,
+            ]
+        )
         return 1
 
 
@@ -205,6 +203,16 @@ def get_command(self, file, **options):
         command = self.get_command_ex(file, **options)[0]
         return f"({command} {quote(file)}; rm -f {quote(file)})&"
 
+
+class XDGViewer(UnixViewer):
+    """
+    The freedesktop.org ``xdg-open`` command.
+    """
+
+    def get_command_ex(self, file, **options):
+        command = executable = "xdg-open"
+        return command, executable
+
     def show_file(self, path=None, **options):
         """
         Display given file.
@@ -223,28 +231,11 @@ def show_file(self, path=None, **options):
                 path = options.pop("file")
             else:
                 raise TypeError("Missing required argument: 'path'")
-        fd, temp_path = tempfile.mkstemp()
-        with os.fdopen(fd, "w") as f:
-            f.write(path)
-        with open(temp_path) as f:
-            command = self.get_command_ex(path, **options)[0]
-            subprocess.Popen(
-                ["im=$(cat);" + command + " $im; rm -f $im"], shell=True, stdin=f
-            )
-        os.remove(temp_path)
+        subprocess.Popen(["xdg-open", path])
+        os.remove(path)
         return 1
 
 
-class XDGViewer(UnixViewer):
-    """
-    The freedesktop.org ``xdg-open`` command.
-    """
-
-    def get_command_ex(self, file, **options):
-        command = executable = "xdg-open"
-        return command, executable
-
-
 class DisplayViewer(UnixViewer):
     """
     The ImageMagick ``display`` command.
@@ -257,6 +248,32 @@ def get_command_ex(self, file, title=None, **options):
             command += f" -name {quote(title)}"
         return command, executable
 
+    def show_file(self, path=None, **options):
+        """
+        Display given file.
+
+        Before Pillow 9.1.0, the first argument was ``file``. This is now deprecated,
+        and ``path`` should be used instead.
+        """
+        if path is None:
+            if "file" in options:
+                warnings.warn(
+                    "The 'file' argument is deprecated and will be removed in Pillow "
+                    "10 (2023-07-01). Use 'path' instead.",
+                    DeprecationWarning,
+                )
+                path = options.pop("file")
+            else:
+                raise TypeError("Missing required argument: 'path'")
+        args = ["display"]
+        if "title" in options:
+            args += ["-name", options["title"]]
+        args.append(path)
+
+        subprocess.Popen(args)
+        os.remove(path)
+        return 1
+
 
 class GmDisplayViewer(UnixViewer):
     """The GraphicsMagick ``gm display`` command."""
@@ -266,6 +283,27 @@ def get_command_ex(self, file, **options):
         command = "gm display"
         return command, executable
 
+    def show_file(self, path=None, **options):
+        """
+        Display given file.
+
+        Before Pillow 9.1.0, the first argument was ``file``. This is now deprecated,
+        and ``path`` should be used instead.
+        """
+        if path is None:
+            if "file" in options:
+                warnings.warn(
+                    "The 'file' argument is deprecated and will be removed in Pillow "
+                    "10 (2023-07-01). Use 'path' instead.",
+                    DeprecationWarning,
+                )
+                path = options.pop("file")
+            else:
+                raise TypeError("Missing required argument: 'path'")
+        subprocess.Popen(["gm", "display", path])
+        os.remove(path)
+        return 1
+
 
 class EogViewer(UnixViewer):
     """The GNOME Image Viewer ``eog`` command."""
@@ -275,6 +313,27 @@ def get_command_ex(self, file, **options):
         command = "eog -n"
         return command, executable
 
+    def show_file(self, path=None, **options):
+        """
+        Display given file.
+
+        Before Pillow 9.1.0, the first argument was ``file``. This is now deprecated,
+        and ``path`` should be used instead.
+        """
+        if path is None:
+            if "file" in options:
+                warnings.warn(
+                    "The 'file' argument is deprecated and will be removed in Pillow "
+                    "10 (2023-07-01). Use 'path' instead.",
+                    DeprecationWarning,
+                )
+                path = options.pop("file")
+            else:
+                raise TypeError("Missing required argument: 'path'")
+        subprocess.Popen(["eog", "-n", path])
+        os.remove(path)
+        return 1
+
 
 class XVViewer(UnixViewer):
     """
@@ -290,6 +349,32 @@ def get_command_ex(self, file, title=None, **options):
             command += f" -name {quote(title)}"
         return command, executable
 
+    def show_file(self, path=None, **options):
+        """
+        Display given file.
+
+        Before Pillow 9.1.0, the first argument was ``file``. This is now deprecated,
+        and ``path`` should be used instead.
+        """
+        if path is None:
+            if "file" in options:
+                warnings.warn(
+                    "The 'file' argument is deprecated and will be removed in Pillow "
+                    "10 (2023-07-01). Use 'path' instead.",
+                    DeprecationWarning,
+                )
+                path = options.pop("file")
+            else:
+                raise TypeError("Missing required argument: 'path'")
+        args = ["xv"]
+        if "title" in options:
+            args += ["-name", options["title"]]
+        args.append(path)
+
+        subprocess.Popen(args)
+        os.remove(path)
+        return 1
+
 
 if sys.platform not in ("win32", "darwin"):  # unixoids
     if shutil.which("xdg-open"):

From 0efd532c35b2820943f9b8f55462e4d0a6b47a46 Mon Sep 17 00:00:00 2001
From: Andrew Murray <3112309+radarhere@users.noreply.github.com>
Date: Tue, 18 Jan 2022 11:24:01 +1100
Subject: [PATCH 17/23] Updated formatting

Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
---
 src/PIL/ImageShow.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/PIL/ImageShow.py b/src/PIL/ImageShow.py
index 7212baa1cb1..ccdb0b2a0e9 100644
--- a/src/PIL/ImageShow.py
+++ b/src/PIL/ImageShow.py
@@ -184,7 +184,7 @@ def show_file(self, path=None, **options):
             [
                 sys.executable,
                 "-c",
-                "import os, sys, time;time.sleep(20);os.remove(sys.argv[1])",
+                "import os, sys, time; time.sleep(20); os.remove(sys.argv[1])",
                 path,
             ]
         )

From b26313dda7903de86af513f36732fc9e33e75a98 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 3 Feb 2022 08:58:12 +1100
Subject: [PATCH 18/23] Added delay after opening image with xdg-open

---
 src/PIL/ImageShow.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/PIL/ImageShow.py b/src/PIL/ImageShow.py
index ccdb0b2a0e9..f8829fc21e0 100644
--- a/src/PIL/ImageShow.py
+++ b/src/PIL/ImageShow.py
@@ -126,6 +126,16 @@ def show_file(self, path=None, **options):
         os.system(self.get_command(path, **options))
         return 1
 
+    def _remove_path_after_delay(self, path):
+        subprocess.Popen(
+            [
+                sys.executable,
+                "-c",
+                "import os, sys, time; time.sleep(20); os.remove(sys.argv[1])",
+                path,
+            ]
+        )
+
 
 # --------------------------------------------------------------------
 
@@ -180,14 +190,7 @@ def show_file(self, path=None, **options):
             else:
                 raise TypeError("Missing required argument: 'path'")
         subprocess.call(["open", "-a", "Preview.app", path])
-        subprocess.Popen(
-            [
-                sys.executable,
-                "-c",
-                "import os, sys, time; time.sleep(20); os.remove(sys.argv[1])",
-                path,
-            ]
-        )
+        self._remove_path_after_delay(path)
         return 1
 
 
@@ -232,7 +235,7 @@ def show_file(self, path=None, **options):
             else:
                 raise TypeError("Missing required argument: 'path'")
         subprocess.Popen(["xdg-open", path])
-        os.remove(path)
+        self._remove_path_after_delay(path)
         return 1
 
 

From 1a60a3213522e764b2ae60975309b4f5135018d1 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Thu, 3 Feb 2022 09:46:57 +1100
Subject: [PATCH 19/23] Update CHANGES.rst [ci skip]

---
 CHANGES.rst | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.rst b/CHANGES.rst
index 66d41739330..fc94556528a 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -32,6 +32,15 @@ Changelog (Pillow)
 - Remove readonly from Image.__eq__ #5930
   [hugovk]
 
+9.0.1 (2022-02-03)
+------------------
+
+- In show_file, use os.remove to remove temporary images. CVE-2022-24303 #6010
+  [radarhere, hugovk]
+
+- Restrict builtins within lambdas for ImageMath.eval. CVE-2022-22817 #6009
+  [radarhere]
+
 9.0.0 (2022-01-02)
 ------------------
 

From 94ef447da8fed795624f219fa66980db16048d3a Mon Sep 17 00:00:00 2001
From: alv2017 <v.alishauskaite@gmail.com>
Date: Fri, 28 Jan 2022 11:14:00 +0200
Subject: [PATCH 20/23] src/PIL/ImageShow.py: issue with UnixViewers solved:
 #5976

---
 Tests/test_imageshow.py |   2 +-
 src/PIL/ImageShow.py    | 203 ++++++++++++----------------------------
 2 files changed, 60 insertions(+), 145 deletions(-)

diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py
index bf19a603362..11d7ce5d687 100644
--- a/Tests/test_imageshow.py
+++ b/Tests/test_imageshow.py
@@ -54,7 +54,7 @@ def test_show():
 def test_viewer():
     viewer = ImageShow.Viewer()
 
-    assert viewer.get_format(None) is None
+    assert viewer.get_format(None) == "PNG"
 
     with pytest.raises(NotImplementedError):
         viewer.get_command(None)
diff --git a/src/PIL/ImageShow.py b/src/PIL/ImageShow.py
index f8829fc21e0..fd0647c5c5a 100644
--- a/src/PIL/ImageShow.py
+++ b/src/PIL/ImageShow.py
@@ -15,6 +15,7 @@
 import shutil
 import subprocess
 import sys
+import threading
 import warnings
 from shlex import quote
 
@@ -61,6 +62,9 @@ def show(image, title=None, **options):
 class Viewer:
     """Base class for viewers."""
 
+    format = "PNG"
+    options = {"compress_level": 1}
+
     # main api
 
     def show(self, image, **options):
@@ -81,11 +85,6 @@ def show(self, image, **options):
 
     # hook methods
 
-    format = None
-    """The format to convert the image into."""
-    options = {}
-    """Additional options used to convert the image."""
-
     def get_format(self, image):
         """Return format name, or ``None`` to save as PGM/PPM."""
         return self.format
@@ -126,26 +125,10 @@ def show_file(self, path=None, **options):
         os.system(self.get_command(path, **options))
         return 1
 
-    def _remove_path_after_delay(self, path):
-        subprocess.Popen(
-            [
-                sys.executable,
-                "-c",
-                "import os, sys, time; time.sleep(20); os.remove(sys.argv[1])",
-                path,
-            ]
-        )
-
-
-# --------------------------------------------------------------------
-
 
 class WindowsViewer(Viewer):
     """The default viewer on Windows is the default system application for PNG files."""
 
-    format = "PNG"
-    options = {"compress_level": 1}
-
     def get_command(self, file, **options):
         return (
             f'start "Pillow" /WAIT "{file}" '
@@ -161,9 +144,6 @@ def get_command(self, file, **options):
 class MacViewer(Viewer):
     """The default viewer on macOS using ``Preview.app``."""
 
-    format = "PNG"
-    options = {"compress_level": 1}
-
     def get_command(self, file, **options):
         # on darwin open returns immediately resulting in the temp
         # file removal while app is opening
@@ -199,22 +179,31 @@ def show_file(self, path=None, **options):
 
 
 class UnixViewer(Viewer):
-    format = "PNG"
-    options = {"compress_level": 1}
+    opened_images = []
 
     def get_command(self, file, **options):
-        command = self.get_command_ex(file, **options)[0]
-        return f"({command} {quote(file)}; rm -f {quote(file)})&"
+        return self.get_command_ex(file, **options)[0]
 
+    def get_executable(self, file, **options):
+        return self.get_command_ex(file, **options)[1]
 
-class XDGViewer(UnixViewer):
-    """
-    The freedesktop.org ``xdg-open`` command.
-    """
+    def thread_monitor(self, th):
+        """
+        Monitors image viewing threads.
+        The last remaining monitoring thread is responsible for removal of temporary images.
+        """
+        th.join()
+        if threading.active_count() == 2:
+            for f in self.opened_images:
+                if os.path.isfile(f):
+                    try:
+                        os.remove(f)
+                    except OSError as e:
+                        print(f"failed to delete the file: {f}")
+                        print(e)
+            return 1
+        return 0
 
-    def get_command_ex(self, file, **options):
-        command = executable = "xdg-open"
-        return command, executable
 
     def show_file(self, path=None, **options):
         """
@@ -234,48 +223,44 @@ def show_file(self, path=None, **options):
                 path = options.pop("file")
             else:
                 raise TypeError("Missing required argument: 'path'")
-        subprocess.Popen(["xdg-open", path])
-        self._remove_path_after_delay(path)
+
+        path = quote(path)
+        command = self.get_command(path, **options)
+        th = threading.Thread(target=subprocess.run, args=(command.split(),),
+                              kwargs={
+                                  "stdout": subprocess.PIPE,
+                                  "stderr": subprocess.PIPE,
+                              },
+                              name=path)
+        self.opened_images.append(th.name)
+        th.start()
+
+        th_monitor = threading.Thread(target=self.thread_monitor, args=(th,))
+        th_monitor.start()
+
         return 1
 
 
-class DisplayViewer(UnixViewer):
+class XDGViewer(UnixViewer):
     """
-    The ImageMagick ``display`` command.
-    This viewer supports the ``title`` parameter.
+    The freedesktop.org ``xdg-open`` command.
     """
 
-    def get_command_ex(self, file, title=None, **options):
-        command = executable = "display"
-        if title:
-            command += f" -name {quote(title)}"
+    def get_command_ex(self, file, **options):
+        executable = "xdg-open"
+        command = f"xdg-open {quote(file)}"
         return command, executable
 
-    def show_file(self, path=None, **options):
-        """
-        Display given file.
 
-        Before Pillow 9.1.0, the first argument was ``file``. This is now deprecated,
-        and ``path`` should be used instead.
-        """
-        if path is None:
-            if "file" in options:
-                warnings.warn(
-                    "The 'file' argument is deprecated and will be removed in Pillow "
-                    "10 (2023-07-01). Use 'path' instead.",
-                    DeprecationWarning,
-                )
-                path = options.pop("file")
-            else:
-                raise TypeError("Missing required argument: 'path'")
-        args = ["display"]
-        if "title" in options:
-            args += ["-name", options["title"]]
-        args.append(path)
+class DisplayViewer(UnixViewer):
+    """
+    The ImageMagick ``display`` command.
+    """
 
-        subprocess.Popen(args)
-        os.remove(path)
-        return 1
+    def get_command_ex(self, file, **options):
+        executable = "display"
+        command = f"display {quote(file)}"
+        return command, executable
 
 
 class GmDisplayViewer(UnixViewer):
@@ -283,105 +268,33 @@ class GmDisplayViewer(UnixViewer):
 
     def get_command_ex(self, file, **options):
         executable = "gm"
-        command = "gm display"
+        command = f"gm display {quote(file)}"
         return command, executable
 
-    def show_file(self, path=None, **options):
-        """
-        Display given file.
-
-        Before Pillow 9.1.0, the first argument was ``file``. This is now deprecated,
-        and ``path`` should be used instead.
-        """
-        if path is None:
-            if "file" in options:
-                warnings.warn(
-                    "The 'file' argument is deprecated and will be removed in Pillow "
-                    "10 (2023-07-01). Use 'path' instead.",
-                    DeprecationWarning,
-                )
-                path = options.pop("file")
-            else:
-                raise TypeError("Missing required argument: 'path'")
-        subprocess.Popen(["gm", "display", path])
-        os.remove(path)
-        return 1
-
 
 class EogViewer(UnixViewer):
     """The GNOME Image Viewer ``eog`` command."""
 
     def get_command_ex(self, file, **options):
         executable = "eog"
-        command = "eog -n"
+        command = f"eog -n {quote(file)}"
         return command, executable
 
-    def show_file(self, path=None, **options):
-        """
-        Display given file.
-
-        Before Pillow 9.1.0, the first argument was ``file``. This is now deprecated,
-        and ``path`` should be used instead.
-        """
-        if path is None:
-            if "file" in options:
-                warnings.warn(
-                    "The 'file' argument is deprecated and will be removed in Pillow "
-                    "10 (2023-07-01). Use 'path' instead.",
-                    DeprecationWarning,
-                )
-                path = options.pop("file")
-            else:
-                raise TypeError("Missing required argument: 'path'")
-        subprocess.Popen(["eog", "-n", path])
-        os.remove(path)
-        return 1
-
 
 class XVViewer(UnixViewer):
     """
     The X Viewer ``xv`` command.
-    This viewer supports the ``title`` parameter.
     """
 
-    def get_command_ex(self, file, title=None, **options):
+    def get_command_ex(self, file, **options):
         # note: xv is pretty outdated.  most modern systems have
         # imagemagick's display command instead.
-        command = executable = "xv"
-        if title:
-            command += f" -name {quote(title)}"
+        executable = "xv"
+        command = f"xv {quote(file)}"
         return command, executable
 
-    def show_file(self, path=None, **options):
-        """
-        Display given file.
-
-        Before Pillow 9.1.0, the first argument was ``file``. This is now deprecated,
-        and ``path`` should be used instead.
-        """
-        if path is None:
-            if "file" in options:
-                warnings.warn(
-                    "The 'file' argument is deprecated and will be removed in Pillow "
-                    "10 (2023-07-01). Use 'path' instead.",
-                    DeprecationWarning,
-                )
-                path = options.pop("file")
-            else:
-                raise TypeError("Missing required argument: 'path'")
-        args = ["xv"]
-        if "title" in options:
-            args += ["-name", options["title"]]
-        args.append(path)
-
-        subprocess.Popen(args)
-        os.remove(path)
-        return 1
-
 
 if sys.platform not in ("win32", "darwin"):  # unixoids
-    if shutil.which("xdg-open"):
-        register(XDGViewer)
     if shutil.which("display"):
         register(DisplayViewer)
     if shutil.which("gm"):
@@ -390,6 +303,8 @@ def show_file(self, path=None, **options):
         register(EogViewer)
     if shutil.which("xv"):
         register(XVViewer)
+    if shutil.which("xdg-open"):
+        register(XDGViewer)
 
 
 class IPythonViewer(Viewer):

From 81d2becfc461d9b1bb53a4105a0c709a551d0a17 Mon Sep 17 00:00:00 2001
From: alv2017 <v.alishauskaite@gmail.com>
Date: Mon, 31 Jan 2022 23:51:05 +0200
Subject: [PATCH 21/23] Code formatting applied

---
 src/PIL/ImageShow.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/PIL/ImageShow.py b/src/PIL/ImageShow.py
index fd0647c5c5a..62021f44fa8 100644
--- a/src/PIL/ImageShow.py
+++ b/src/PIL/ImageShow.py
@@ -190,7 +190,8 @@ def get_executable(self, file, **options):
     def thread_monitor(self, th):
         """
         Monitors image viewing threads.
-        The last remaining monitoring thread is responsible for removal of temporary images.
+        The last remaining monitoring thread is responsible
+        for removal of temporary images.
         """
         th.join()
         if threading.active_count() == 2:
@@ -226,12 +227,15 @@ def show_file(self, path=None, **options):
 
         path = quote(path)
         command = self.get_command(path, **options)
-        th = threading.Thread(target=subprocess.run, args=(command.split(),),
-                              kwargs={
-                                  "stdout": subprocess.PIPE,
-                                  "stderr": subprocess.PIPE,
-                              },
-                              name=path)
+        th = threading.Thread(
+            target=subprocess.run,
+            args=(command.split(),),
+            kwargs={
+                "stdout": subprocess.PIPE,
+                "stderr": subprocess.PIPE,
+            },
+            name=path,
+        )
         self.opened_images.append(th.name)
         th.start()
 

From 9f64a2f29c3ce1d0fcccf2efea0db96fa6fc9b74 Mon Sep 17 00:00:00 2001
From: alv2017 <v.alishauskaite@gmail.com>
Date: Wed, 2 Feb 2022 12:26:24 +0200
Subject: [PATCH 22/23] Corrections applied: - Image.show() method is no longer
 supporting **title** option, corresponding docs were updated; - XDGViewer is
 moved to the end of the viewers queue, this viewer will be utilized when all
 the previous viewers failed to open the image; - Documentation of xvViewer
 has been updated; - The tests that were opening images in viewers were
 disabled. Reason: due to implementation a program or a test will not
 terminate till the image in the viewer is explicitly closed.

---
 Tests/helper.py         | 3 +--
 Tests/test_imageshow.py | 9 ++++++---
 src/PIL/Image.py        | 8 +++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/Tests/helper.py b/Tests/helper.py
index feccce6bcf9..08549aead58 100644
--- a/Tests/helper.py
+++ b/Tests/helper.py
@@ -27,8 +27,7 @@
     class test_image_results:
         @staticmethod
         def upload(a, b):
-            a.show()
-            b.show()
+            return None
 
 elif "GITHUB_ACTIONS" in os.environ:
     HAS_UPLOADER = True
diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py
index 11d7ce5d687..3351d7f9d3b 100644
--- a/Tests/test_imageshow.py
+++ b/Tests/test_imageshow.py
@@ -41,9 +41,12 @@ def show_image(self, image, **options):
     ImageShow._viewers.pop(0)
 
 
-@pytest.mark.skipif(
-    not on_ci() or is_win32(),
-    reason="Only run on CIs; hangs on Windows CIs",
+@pytest.mark.skip(
+    reason=(
+        "Due to implementation of Unix and Windows viewers",
+        "a program or a test relying on the viewer will not terminate",
+        "till the image is explicitly closed",
+    )
 )
 def test_show():
     for mode in ("1", "I;16", "LA", "RGB", "RGBA"):
diff --git a/src/PIL/Image.py b/src/PIL/Image.py
index 02b71e612a0..0736a58bd22 100644
--- a/src/PIL/Image.py
+++ b/src/PIL/Image.py
@@ -2269,14 +2269,16 @@ def show(self, title=None):
         The image is first saved to a temporary file. By default, it will be in
         PNG format.
 
-        On Unix, the image is then opened using the **display**, **eog** or
-        **xv** utility, depending on which one can be found.
+        On Unix, the image is then opened using the **display**, **gm**, **eog**,
+        or **xv** utility. Finally, if all the viewers failed, the attempt is made
+        to open the image file using **xdg-open** command,
+        this command uses the default system image viewer.
 
         On macOS, the image is opened with the native Preview application.
 
         On Windows, the image is opened with the standard PNG display utility.
 
-        :param title: Optional title to use for the image window, where possible.
+        :param title: has been deprecated
         """
 
         _show(self, title=title)

From 92ccf428414ae2c972eba6aad7d7e25a65fa6710 Mon Sep 17 00:00:00 2001
From: alv2017 <v.alishauskaite@gmail.com>
Date: Wed, 2 Feb 2022 13:00:25 +0200
Subject: [PATCH 23/23] Test skip reason has been corrected.

---
 Tests/test_imageshow.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Tests/test_imageshow.py b/Tests/test_imageshow.py
index 3351d7f9d3b..03dc6a506c9 100644
--- a/Tests/test_imageshow.py
+++ b/Tests/test_imageshow.py
@@ -42,11 +42,10 @@ def show_image(self, image, **options):
 
 
 @pytest.mark.skip(
-    reason=(
-        "Due to implementation of Unix and Windows viewers",
-        "a program or a test relying on the viewer will not terminate",
-        "till the image is explicitly closed",
-    )
+    reason="""Due to implementation of Unix and Windows viewers",
+        a program or a test relying on the viewer will not terminate"
+        "till the image is explicitly closed"
+        """
 )
 def test_show():
     for mode in ("1", "I;16", "LA", "RGB", "RGBA"):