[Git][freetype/freetype][master] 4 commits: * src/pcf/pcfutil.c (BSWAP16

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

fab53f7b

by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-10-21T19:08:20-04:00

* src/pcf/pcfutil.c (BSWAP16): Limit clang support.

These ancient builtins have been supported by clang since 2013. We
condition it somewhat stricter but still around 2017.  This is more
portable than `__has_builtin`. Fixes #1260.

09ae6eb6
by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-10-22T08:13:35-04:00
```
* src/raster/ftraster.c (Insert_Y_Turn): Improve flow.
```

d1e894b1

by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-10-22T13:08:36-04:00

[raster] Clean up sweeping.

* src/raster/ftraster.c (Draw_Sweep): Zero initialize the working
lists directly and remove unnecessary y-turn checks.
(Init_Linked): Removed.

a0e10a87

by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-10-23T17:47:10-04:00

[raster] Slightly improve the pool design.

* src/raster/ftraster.c (TProfile): Include the variable array member
and repackage with pointers first.
(New_Profile): Advance the top using the variable array pointer.

Changes:

src/pcf/pcfutil.c

@@ -57,7 +57,7 @@ in this Software without prior written authorization from The Open Group.
+   }
 -#if defined( __clang__ )                                            || \
 +#if ( defined( __clang_major__ ) && __clang_major__ >= 5 )          || \
      ( defined( __GNUC__ )                                          &&  \
        ( __GNUC__ > 4 || ( __GNUC__ == 4 && __GNUC_MINOR__ >= 8 ) ) )

src/raster/ftraster.c

@@ -305,16 +305,6 @@
    typedef unsigned char   Byte, *PByte;
    typedef char            Bool;
+-
 -  typedef union  Alignment_
 -  {
 -    Long    l;
 -    void*   p;
 -    void  (*f)(void);
+-
 -  } Alignment, *PAlignment;
+-
+-
    typedef struct  TPoint_
+   {
      Long  x;
@@ -345,31 +335,28 @@
    struct  TProfile_
+   {
 -    FT_F26Dot6  X;           /* current coordinate during sweep          */
      PProfile    link;        /* link to next profile (various purposes)  */
 +    PProfile    next;        /* next profile in same contour, used       */
 +                             /* during drop-out control                  */
      PLong       offset;      /* start of profile's data in render pool   */
 +    Long        height;      /* profile's height in scanlines            */
 +    Long        start;       /* profile's starting scanline              */
      UShort      flags;       /* Bit 0-2: drop-out mode                   */
                               /* Bit 3: profile orientation (up/down)     */
                               /* Bit 4: is top profile?                   */
                               /* Bit 5: is bottom profile?                */
 -    Long        height;      /* profile's height in scanlines            */
 -    Long        start;       /* profile's starting scanline              */
      Int         countL;      /* number of lines to step before this      */
                               /* profile becomes drawable                 */
+-
 -    PProfile    next;        /* next profile in same contour, used       */
 -                             /* during drop-out control                  */
 +    FT_F26Dot6  X;           /* current coordinate during sweep          */
 +    Long        x[1];        /* actually variable array of scanline      */
 +                             /* intersections with `height` elements     */
    };
    typedef PProfile   TProfileList;
    typedef PProfile*  PProfileList;
 -#define AlignProfileSize \
 -  ( ( sizeof ( TProfile ) + sizeof ( Alignment ) - 1 ) / sizeof ( Long ) )
+-
+-
  #undef RAS_ARG
  #undef RAS_ARGS
  #undef RAS_VAR
@@ -609,19 +596,24 @@
    static Bool
    Insert_Y_Turn( RAS_ARGS Int  y )
+   {
 -    PLong  y_turns;
 -    Int    n;
 +    Int    n       = ras.numTurns;
 +    PLong  y_turns = ras.maxBuff;
 -    n       = ras.numTurns - 1;
 -    y_turns = ras.sizeBuff - ras.numTurns;
+-
      /* look for first y value that is <= */
 -    while ( n >= 0 && y < y_turns[n] )
 -      n--;
 +    while ( n-- && y < y_turns[n] )
 +      ;
      /* if it is <, simply insert it, ignore if == */
 -    if ( n >= 0 && y > y_turns[n] )
 +    if ( n < 0 || y > y_turns[n] )
 +    {
 +      ras.maxBuff--;
 +      if ( ras.maxBuff <= ras.top )
 +      {
 +        ras.error = FT_THROW( Raster_Overflow );
 +        return FAILURE;
 +      }
++
        do
+       {
          Int  y2 = (Int)y_turns[n];
@@ -629,18 +621,9 @@
          y_turns[n] = y;
          y = y2;
 -      } while ( --n >= 0 );
 +      } while ( n-- >= 0 );
 -    if ( n < 0 )
 -    {
 -      ras.maxBuff--;
 -      if ( ras.maxBuff <= ras.top )
 -      {
 -        ras.error = FT_THROW( Raster_Overflow );
 -        return FAILURE;
 -      }
        ras.numTurns++;
 -      ras.sizeBuff[-ras.numTurns] = y;
+     }
      return SUCCESS;
@@ -674,7 +657,7 @@
      if ( !ras.cProfile || ras.cProfile->height )
+     {
        ras.cProfile  = (PProfile)ras.top;
 -      ras.top      += AlignProfileSize;
 +      ras.top       = ras.cProfile->x;
        if ( ras.top >= ras.maxBuff )
+       {
@@ -2009,19 +1992,6 @@
    /*************************************************************************/
 -  /**************************************************************************
 -   *
 -   * Init_Linked
 -   *
 -   *   Initializes an empty linked list.
 -   */
 -  static void
 -  Init_Linked( TProfileList*  l )
 -  {
 -    *l = NULL;
 -  }
+-
+-
    /**************************************************************************
+    *
     * InsNew
@@ -2629,6 +2599,9 @@
+    *
     * Generic Sweep Drawing routine
+    *
 +   * Note that this routine is executed with the pool containing at least
 +   * two valid profiles (up and down) and two y-turns (top and bottom).
 +   *
     */
    static Bool
@@ -2642,16 +2615,10 @@
      Long          x1, x2, xs, e1, e2;
 -    TProfileList  waiting;
 -    TProfileList  draw_left, draw_right;
+-
+-
 -    /* initialize empty linked lists */
 +    TProfileList  waiting    = NULL;
 +    TProfileList  draw_left  = NULL;
 +    TProfileList  draw_right = NULL;
 -    Init_Linked( &waiting );
+-
 -    Init_Linked( &draw_left  );
 -    Init_Linked( &draw_right );
      /* first, compute min and max Y */
@@ -2677,13 +2644,6 @@
        P = Q;
+     }
 -    /* check the Y-turns */
 -    if ( ras.numTurns == 0 )
 -    {
 -      ras.error = FT_THROW( Invalid_Outline );
 -      return FAILURE;
 -    }
+-
      /* now initialize the sweep */
      ras.Proc_Sweep_Init( RAS_VARS min_Y, max_Y );
@@ -2703,8 +2663,7 @@
      y        = min_Y;
      y_height = 0;
 -    if ( ras.numTurns > 0                     &&
 -         ras.sizeBuff[-ras.numTurns] == min_Y )
 +    if ( ras.sizeBuff[-ras.numTurns] == min_Y )
        ras.numTurns--;
      while ( ras.numTurns > 0 )

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype][master] 4 commits: * src/pcf/pcfutil.c (BSWAP16): Limit clang support.
Date:	Mon, 23 Oct 2023 21:53:00 +0000