[Git][freetype/freetype][smooth_malloc] 3 commits: Switch to dynamic mem

Alexei Podtelezhnikov pushed to branch smooth_malloc at FreeType / FreeType

Commits:

7e7c3489

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

Switch to dynamic memory allocation.

This is a proof of concept for benchmarking.

* src/smooth/ftgrays.c (gray_TWorker): Store `memory`.
(gray_convert_glyph): Allocate memory dynamically and handle errors.
(gray_raster_render): Set memory.

b8aae190

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

[smooth] Estimate of the rendering pool size.

The estimate is based on the taxi perimeter with extra space added
for local extrema.

* src/smooth/ftgrays.c (gray_taxi): New function for the perimeter.
(gray_convert_glyph): Updated, banding suppressed.

d1016527
by Alexei Podtelezhnikov (Алексей Подтележников) at 2023-10-06T23:02:16-04:00
```
* src/smooth/ftgrays.c (gray_convert_glyph): Limit complexity.
```

1 changed file:

src/smooth/ftgrays.c

Changes:

src/smooth/ftgrays.c

@@ -490,6 +490,7 @@ typedef ptrdiff_t  FT_PtrDist;
    typedef struct  gray_TWorker_
+   {
      ft_jmp_buf  jump_buffer;
 +    FT_Memory   memory;
      TCoord  min_ex, max_ex;  /* min and max integer pixel coordinates */
      TCoord  min_ey, max_ey;
@@ -1934,7 +1935,7 @@ typedef ptrdiff_t  FT_PtrDist;
        if ( continued )
          FT_Trace_Enable();
 -      FT_TRACE7(( "band [%d..%d]: %td cell%s remaining/\n",
 +      FT_TRACE7(( "band [%d..%d]: %td cell%s remaining\n",
                    ras.min_ey,
                    ras.max_ey,
                    ras.cell_null - ras.cell_free,
@@ -1952,15 +1953,57 @@ typedef ptrdiff_t  FT_PtrDist;
+   }
 +  /*
 +   * The taxicab perimeter of the entire outline is used to estimate
 +   * the necessary memory pool or the job size in general.  Clipping
 +   * is ignored because it might hurt the performance.
 +   */
 +  static long
 +  gray_taxi( RAS_ARG )
 +  {
 +    FT_Outline*  outline = &ras.outline;
 +    short        c, p, first, last;
 +    FT_Vector    d, v;
 +    FT_Pos       taxi;
++
++
 +    taxi = 0;
 +    last = -1;
 +    for ( c = 0; c < outline->n_contours; c++ )
 +    {
 +      first = last + 1;
 +      last = outline->contours[c];
++
 +      d = outline->points[last];
 +      for ( p = first; p <= last; p++ )
 +      {
 +        v    = outline->points[p];
 +        d.x -= v.x;
 +        d.y -= v.y;
++
 +        taxi += FT_ABS( d.x ) + FT_ABS( d.y );
++
 +        d = v;
 +      }
 +    }
++
 +    return taxi >> 6;
 +  }
++
++
    static int
    gray_convert_glyph( RAS_ARG )
+   {
      const TCoord  yMin = ras.min_ey;
      const TCoord  yMax = ras.max_ey;
 -    TCell    buffer[FT_MAX_GRAY_POOL];
 +    FT_Error   error = FT_THROW( Ok );
 +    FT_Memory  memory = ras.memory;
++
 +    TCell*   buffer;
      size_t   height = (size_t)( yMax - yMin );
 -    size_t   n = FT_MAX_GRAY_POOL / 8;
 +    size_t   n;
 +    long     size;
      TCoord   y;
      TCoord   bands[32];  /* enough to accommodate bisections */
      TCoord*  band;
@@ -1968,8 +2011,25 @@ typedef ptrdiff_t  FT_PtrDist;
      int  continued = 0;
 +    size = gray_taxi( RAS_VAR );
++
 +    /* taxicab perimeters in excess of 20 CBox perimeters are    */
 +    /* not rendered unless in direct mode with possible clipping */
 +    if ( !ras.render_span                                     &&
 +         size > 20 * 2 * ( ras.max_ex - ras.min_ex + height ) )
 +      return FT_THROW( Invalid_Outline );
++
 +    size += height * sizeof ( PCell ) / sizeof ( TCell ) +
 +            9;  /* empirical extra for local extrema */
++
 +    if ( FT_QNEW_ARRAY( buffer, size ) )
 +      return error;
++
 +    FT_TRACE7(( "Allocated %ld cells (%ld bytes)\n",
 +                size, size * sizeof ( TCell ) ));
++
      /* Initialize the null cell at the end of the poll. */
 -    ras.cell_null        = buffer + FT_MAX_GRAY_POOL - 1;
 +    ras.cell_null        = buffer + size - 1;
      ras.cell_null->x     = CELL_MAX_X_VALUE;
      ras.cell_null->area  = 0;
      ras.cell_null->cover = 0;
@@ -1978,13 +2038,6 @@ typedef ptrdiff_t  FT_PtrDist;
      /* set up vertical bands */
      ras.ycells     = (PCell*)buffer;
 -    if ( height > n )
 -    {
 -      /* two divisions rounded up */
 -      n       = ( height + n - 1 ) / n;
 -      height  = ( height + n - 1 ) / n;
 -    }
+-
      for ( y = yMin; y < yMax; )
+     {
        ras.min_ey = y;
@@ -1999,7 +2052,6 @@ typedef ptrdiff_t  FT_PtrDist;
+       {
          TCoord  width = band[0] - band[1];
          TCoord  w;
 -        int     error;
          for ( w = 0; w < width; ++w )
@@ -2028,7 +2080,7 @@ typedef ptrdiff_t  FT_PtrDist;
            continue;
+         }
          else if ( error != Smooth_Err_Raster_Overflow )
 -          return error;
 +          goto Exit;
          /* render pool overflow; we will reduce the render band by half */
          width >>= 1;
@@ -2037,7 +2089,8 @@ typedef ptrdiff_t  FT_PtrDist;
          if ( width == 0 )
+         {
            FT_TRACE7(( "gray_convert_glyph: rotten glyph\n" ));
 -          return FT_THROW( Raster_Overflow );
 +          error = FT_THROW( Raster_Overflow );
 +          goto Exit;
+         }
          band++;
@@ -2046,7 +2099,9 @@ typedef ptrdiff_t  FT_PtrDist;
        } while ( band >= bands );
+     }
 -    return Smooth_Err_Ok;
 +  Exit:
 +    FT_FREE( buffer );
 +    return error;
+   }
@@ -2132,6 +2187,8 @@ typedef ptrdiff_t  FT_PtrDist;
      if ( ras.max_ex <= ras.min_ex || ras.max_ey <= ras.min_ey )
        return Smooth_Err_Ok;
 +    ras.memory = (FT_Memory)((gray_PRaster)raster)->memory;
++
      return gray_convert_glyph( RAS_VAR );
+   }

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype][smooth_malloc] 3 commits: Switch to dynamic memory allocation.
Date:	Sat, 07 Oct 2023 03:03:36 +0000