[Git][freetype/freetype-demos][master] 2 commits: * src/ftmulti.c: Clean

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType Demo Programs

Commits:

2c9e077f
by Alexei Podtelezhnikov at 2023-02-12T11:25:08-05:00
```
* src/ftmulti.c: Clean up and fix warnings.
```

840a3953

by Alexei Podtelezhnikov at 2023-02-12T11:59:21-05:00

[ftmulti] Enable fill rule flag testing.

Variation fonts often relay on overlapping contours. To reveal them,
we enable turning the even-odd fill rule on and off. This flag is
always off in FreeType by default but supported by the anti-aliased
renderer.

* src/ftmulti.c (Process_Event): Reassign F3 to fill rule toggle,
assign Tab to anti-aliasing toggle.
(Render_Glyph): Tinker with the fill rule flags before rendering.

1 changed file:

src/ftmulti.c

Changes:

src/ftmulti.c

@@ -85,8 +85,8 @@
    static grSurface*    surface;      /* current display surface     */
    static grBitmap*     bit;          /* current display bitmap      */
 -  static int  width     = DIM_X;     /* window width                */
 -  static int  height    = DIM_Y;     /* window height               */
 +  static unsigned short  width  = DIM_X;     /* window width        */
 +  static unsigned short  height = DIM_Y;     /* window height       */
    static int  num_glyphs;            /* number of glyphs            */
    static int  ptsize;                /* current point size          */
@@ -94,6 +94,7 @@
    static int  hinted    = 1;         /* is glyph hinting active?    */
    static int  grouping  = 1;         /* is axis grouping active?    */
    static int  antialias = 1;         /* is anti-aliasing active?    */
 +  static int  fillrule  = 0x0;       /* flip fill flags or not?     */
    static int  overlaps  = 0x0;       /* flip overlap flags or not?  */
    static int  Num;                   /* current first glyph index   */
@@ -291,7 +292,8 @@
    static void
    Init_Display( void )
+   {
 -    grBitmap  bitmap = { height, width, 0, gr_pixel_mode_none, 256, NULL };
 +    grBitmap  bitmap = { (int)height, (int)width, 0,
 +                         gr_pixel_mode_none, 256, NULL };
      grInitDevices();
@@ -319,8 +321,9 @@
      if ( glyph->format != FT_GLYPH_FORMAT_BITMAP )
+     {
        /* overlap flags mitigate AA rendering artifacts in overlaps */
 -      /* by oversampling, toggle the flag to test the effect       */
 -      glyph->outline.flags ^= overlaps;
 +      /* by oversampling; even-odd fill rule reveals the overlaps; */
 +      /* toggle these flag to test the effects                     */
 +      glyph->outline.flags ^= overlaps | fillrule;
        error = FT_Render_Glyph( glyph, antialias ? FT_RENDER_MODE_NORMAL
                                                  : FT_RENDER_MODE_MONO );
@@ -370,11 +373,9 @@
    LoadChar( unsigned int  idx,
              int           hint )
+   {
 -    int  flags;
 +    int  flags = FT_LOAD_NO_BITMAP;
 -    flags = FT_LOAD_NO_BITMAP;
+-
      if ( !hint )
        flags |= FT_LOAD_NO_HINTING;
@@ -383,27 +384,20 @@
    static FT_Error
 -  Render_All( unsigned int  first_glyph,
 -              int           pt_size )
 +  Render_All( int  first_glyph )
+   {
 -    int           start_x, start_y, step_y, x, y, w;
 -    unsigned int  i;
+-
 +    int  start_x = 18 * 8;
 +    int  start_y = size->metrics.y_ppem * 4 / 5 + HEADER_HEIGHT * 3;
 +    int  step_y  = size->metrics.y_ppem + 10;
 +    int  x, y, w, i;
 -    start_x = 18 * 8;
 -    start_y = size->metrics.y_ppem * 4 / 5 + HEADER_HEIGHT * 3;
 -    step_y  = size->metrics.y_ppem + 10;
      x = start_x;
      y = start_y;
      i = first_glyph;
 -#if 0
 -    while ( i < first_glyph + 1 )
 -#else
 -    while ( i < (unsigned int)num_glyphs )
 -#endif
 +    while ( i < num_glyphs )
+     {
        if ( !( error = LoadChar( i, hinted ) ) )
+       {
@@ -444,19 +438,16 @@
    static FT_Error
 -  Render_Text( unsigned int  first_glyph,
 -               int           pt_size )
 +  Render_Text( int  first_glyph )
+   {
 -    FT_F26Dot6    start_x, start_y, step_y, x, y;
 -    unsigned int  i;
 +    int  start_x = 18 * 8;
 +    int  start_y = size->metrics.y_ppem * 4 / 5 + HEADER_HEIGHT * 3;
 +    int  step_y  = size->metrics.y_ppem + 10;
 +    int  x, y, i;
      const unsigned char*  p;
 -    start_x = 18 * 8;
 -    start_y = size->metrics.y_ppem * 4 / 5 + HEADER_HEIGHT * 3;
 -    step_y  = size->metrics.y_ppem + 10;
+-
      x = start_x;
      y = start_y;
@@ -551,13 +542,15 @@
      grLn();
      grWriteln( "F1, ?       display this help screen" );
      grWriteln( "q, ESC      quit ftmulti" );
 +    grLn();
      grWriteln( "F2          toggle axis grouping" );
 -    grWriteln( "F3          toggle outline hinting" );
 +    grWriteln( "F3          toggle fill rule flags" );
      grWriteln( "F4          toggle overlap flags" );
 -    grWriteln( "F5          toggle anti-aliasing" );
 +    grWriteln( "F5          toggle outline hinting" );
      grWriteln( "F6          cycle through hinting engines (if available)" );
      grLn();
 -    grWriteln( "space       toggle rendering mode" );
 +    grWriteln( "Tab         toggle anti-aliasing" );
 +    grWriteln( "Space       toggle rendering mode" );
      grLn();
      grWriteln( ", .         previous/next font" );
      grLn();
@@ -624,6 +617,10 @@
        Help();
        break;
 +    case grKEY( ',' ):
 +    case grKEY( '.' ):
 +      return (int)event.key;
++
      /* mode keys */
      case grKeyF2:
@@ -633,10 +630,11 @@
        set_up_axes();
        break;
 -    case grKeyF5:
 -      antialias  = !antialias;
 -      new_header = antialias ? "anti-aliasing is now on"
 -                             : "anti-aliasing is now off";
 +    case grKeyF3:
 +      fillrule  ^= FT_OUTLINE_EVEN_ODD_FILL;
 +      new_header = fillrule
 +                     ? "fill rule flags are flipped"
 +                     : "fill rule flags are unchanged";
        break;
      case grKeyF4:
@@ -646,22 +644,12 @@
                       : "overlap flags are unchanged";
        break;
 -    case grKEY( ',' ):
 -    case grKEY( '.' ):
 -      return (int)event.key;
+-
 -    case grKeyF3:
 +    case grKeyF5:
        hinted     = !hinted;
        new_header = hinted ? "glyph hinting is now active"
                            : "glyph hinting is now ignored";
        break;
 -    case grKEY( ' ' ):
 -      render_mode ^= 1;
 -      new_header   = render_mode ? "rendering all glyphs in font"
 -                                 : "rendering test text string";
 -      break;
+-
      case grKeyF6:
        if ( !strcmp( font_format, "CFF" ) )
          FTDemo_Event_Cff_Hinting_Engine_Change( library,
@@ -679,6 +667,18 @@
          tt_interpreter_version_change();
        break;
 +    case grKeyTab:
 +      antialias  = !antialias;
 +      new_header = antialias ? "anti-aliasing is now on"
 +                             : "anti-aliasing is now off";
 +      break;
++
 +    case grKEY( ' ' ):
 +      render_mode ^= 1;
 +      new_header   = render_mode ? "rendering all glyphs in font"
 +                                 : "rendering test text string";
 +      break;
++
      /* MM-related keys */
      case grKEY( '+' ):
@@ -974,7 +974,7 @@
          break;
        case 'd':
 -        if ( sscanf( optarg, "%ux%u", &width, &height ) != 2 )
 +        if ( sscanf( optarg, "%hux%hu", &width, &height ) != 2 )
            usage( execname );
          break;
@@ -1150,11 +1150,11 @@
          switch ( render_mode )
+         {
          case 0:
 -          Render_Text( (unsigned int)Num, ptsize );
 +          Render_Text( Num );
            break;
          default:
 -          Render_All( (unsigned int)Num, ptsize );
 +          Render_All( Num );
+         }
          strbuf_format( header, "%.50s %.50s (file %.100s)",

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype-demos][master] 2 commits: * src/ftmulti.c: Clean up and fix warnings.
Date:	Sun, 12 Feb 2023 17:12:43 +0000