[Git][freetype/freetype-demos][master] 2 commits: * src/ttdebug.c (RunIn

Werner Lemberg pushed to branch master at FreeType / FreeType Demo Programs

Commits:

a94ddbe2

by Hin-Tak Leung at 2023-07-08T05:45:13+02:00

* src/ttdebug.c (RunIns): Signature fix.

A somewhat similar change to what happened in the FreeType library:

  commit 95d635eab1b08a0051de07b6c33067d2c1984848
  Author: Werner Lemberg <wl@gnu.org>
  Date:   Sun May 7 08:34:32 2023 +0200

      [truetype] Signature fixes.

Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net>

2149b9c7

by Hin-Tak Leung at 2023-07-08T06:02:35+02:00

rsvg-port.c: Simplify usage of `rsvg_handle_render_*`.

* src/rsvg-port.c (rsvg_port_preset_slot): Remove usage of
`rsvg_handle_render_document` (and `rsvg_handle_render_cairo`).  They are
functionally the same as `rsvg_handle_render_layer` (and
`rsvg_handle_render_cairo_sub`) with argument id set to NULL.

Signed-off-by: Hin-Tak Leung <htl10@users.sourceforge.net>

2 changed files:

src/rsvg-port.c
src/ttdebug.c

Changes:

src/rsvg-port.c

@@ -194,6 +194,9 @@
      float vertBearingX, vertBearingY;
      float tmpf;
 +    char  *id;
 +    char  str[32];
++
      /* If `cache` is `TRUE` we store calculations in the actual port */
      /* state variable, otherwise we just create a dummy variable and */
@@ -320,69 +323,43 @@
      /* If the document contains only one glyph, `start_glyph_id` and */
      /* `end_glyph_id` have the same value.  Otherwise `end_glyph_id` */
      /* is larger.                                                    */
 -    if ( start_glyph_id == end_glyph_id )
 +    if ( start_glyph_id < end_glyph_id )
+     {
 -      /* Render the whole document to the recording surface. */
 -#if LIBRSVG_CHECK_VERSION( 2, 52, 0 )
 -      {
 -        RsvgRectangle  viewport =
 -        {
 -          .x = 0,
 -          .y = 0,
 -          .width  = (double)dimension_svg.width,
 -          .height = (double)dimension_svg.height,
 -        };
+-
+-
 -        ret = rsvg_handle_render_document( handle,
 -                                           rec_cr,
 -                                           &viewport,
 -                                           NULL );
 -      }
 -#else
 -      ret = rsvg_handle_render_cairo( handle, rec_cr );
 -#endif
+-
 -      if ( ret == FALSE )
 -      {
 -        error = FT_Err_Invalid_SVG_Document;
 -        goto CleanCairo;
 -      }
 +      /* Render only the element with its ID equal to `glyph<ID>`. */
 +      sprintf( str, "#glyph%u", slot->glyph_index );
 +      id = str;
+     }
 -    else if ( start_glyph_id < end_glyph_id )
 +    else
+     {
 -      char  str[32] = "#glyph";
+-
+-
 -      /* Render only the element with its ID equal to `glyph<ID>`. */
 -      sprintf( str + 6, "%u", slot->glyph_index );
 +      /* NULL = Render the whole document */
 +      id = NULL;
 +    }
  #if LIBRSVG_CHECK_VERSION( 2, 52, 0 )
 +    {
 +      RsvgRectangle  viewport =
+       {
 -        RsvgRectangle  viewport =
 -        {
 -          .x = 0,
 -          .y = 0,
 -          .width  = (double)dimension_svg.width,
 -          .height = (double)dimension_svg.height,
 -        };
+-
+-
 -        ret = rsvg_handle_render_layer( handle,
 -                                        rec_cr,
 -                                        str,
 -                                        &viewport,
 -                                        NULL );
 -      }
 +        .x = 0,
 +        .y = 0,
 +        .width  = (double)dimension_svg.width,
 +        .height = (double)dimension_svg.height,
 +      };
++
++
 +      ret = rsvg_handle_render_layer( handle,
 +                                      rec_cr,
 +                                      id,
 +                                      &viewport,
 +                                      NULL );
 +    }
  #else
 -      ret = rsvg_handle_render_cairo_sub( handle, rec_cr, str );
 +    ret = rsvg_handle_render_cairo_sub( handle, rec_cr, id );
  #endif
 -      if ( ret == FALSE )
 -      {
 -        error = FT_Err_Invalid_SVG_Document;
 -        goto CleanCairo;
 -      }
 +    if ( ret == FALSE )
 +    {
 +      error = FT_Err_Invalid_SVG_Document;
 +      goto CleanCairo;
+     }
      /* Get the bounding box of the drawing. */

src/ttdebug.c

@@ -1978,8 +1978,10 @@
    static FT_Error
 -  RunIns( TT_ExecContext  exc )
 +  RunIns( void*  exec )
+   {
 +    TT_ExecContext  exc = (TT_ExecContext)exec;
++
      FT_Int  key;
      FT_Bool  really_leave;
@@ -3049,7 +3051,7 @@
      FT_Set_Debug_Hook( library,
                         FT_DEBUG_HOOK_TRUETYPE,
 -                       (FT_DebugHook_Func)RunIns );
 +                       RunIns );
      printf( "%s\n"
              "press key `h' or `?' for help\n"

From:	Werner Lemberg (@wl)
Subject:	[Git][freetype/freetype-demos][master] 2 commits: * src/ttdebug.c (RunIns): Signature fix.
Date:	Sat, 08 Jul 2023 04:06:43 +0000