logo

oasis

Own branch of Oasis Linux (upstream: <https://git.sr.ht/~mcf/oasis/>) git clone https://anongit.hacktivis.me/git/oasis.git

0001-Avoid-unnecessary-VLAs.patch (1602B)

    

  1. From 4988f2d5bf0ecb941320cfe2cde517c860b792a0 Mon Sep 17 00:00:00 2001
  2. From: Michael Forney <mforney@mforney.org>
  3. Date: Sun, 16 Jun 2019 22:59:39 -0700
  4. Subject: [PATCH] Avoid unnecessary VLAs
  5. Upstream: Equivalent patches applied upstream (891ada89c9 and c80f332798)
  7. ---
  8.  libass/ass_outline.c | 4 ++--
  9.  libass/ass_render.c  | 2 +-
  10.  2 files changed, 3 insertions(+), 3 deletions(-)
  12. diff --git a/libass/ass_outline.c b/libass/ass_outline.c
  13. index 74b791c..d06654a 100644
  14. --- a/libass/ass_outline.c
  15. +++ b/libass/ass_outline.c
  16. @@ -517,7 +517,7 @@ static bool process_arc(StrokerState *str, ASS_Vector pt,
  17.  static bool draw_arc(StrokerState *str, ASS_Vector pt,
  18.                       ASS_DVector normal0, ASS_DVector normal1, double c, int dir)
  19.  {
  20. -    const int max_subdiv = 15;
  21. +    enum { max_subdiv = 15 };
  22.      double mul[max_subdiv + 1];
  23.  
  24.      ASS_DVector center;
  25. @@ -553,7 +553,7 @@ static bool draw_arc(StrokerState *str, ASS_Vector pt,
  26.   */
  27.  static bool draw_circle(StrokerState *str, ASS_Vector pt, int dir)
  28.  {
  29. -    const int max_subdiv = 15;
  30. +    enum { max_subdiv = 15 };
  31.      double mul[max_subdiv + 1], c = 0;
  32.  
  33.      int pos = max_subdiv;
  34. diff --git a/libass/ass_render.c b/libass/ass_render.c
  35. index be76f76..5eb38fd 100644
  36. --- a/libass/ass_render.c
  37. +++ b/libass/ass_render.c
  38. @@ -1234,7 +1234,7 @@ get_bitmap_glyph(ASS_Renderer *render_priv, GlyphInfo *info)
  39.          return;
  40.      }
  41.  
  42. -    const int n_outlines = 3;
  43. +    enum { n_outlines = 3 };
  44.      ASS_Outline outline[n_outlines];
  45.      outline_copy(&outline[0], info->outline);
  46.      outline_copy(&outline[1], info->border[0]);
  47. -- 
  48. 2.20.1