[Git][freetype/freetype][master] 4 commits: Cosmetic zeros.

Alexei Podtelezhnikov pushed to branch master at FreeType / FreeType

Commits:

a81cf5aa
by Alexei Podtelezhnikov at 2021-09-02T22:10:57-04:00
```
Cosmetic zeros.
```

0a6f0f8f

by Alexei Podtelezhnikov at 2021-09-02T22:52:21-04:00

* src/bdf/bdflib.c (bdf_load_font): Remove memory shuffling.

a7b199d0

by Alexei Podtelezhnikov at 2021-09-02T22:58:50-04:00

* src/cache/ftcmanag.c (FTC_Manager_New): Avoid some zeroing.

7f8f0c1c

by Alexei Podtelezhnikov at 2021-09-02T23:30:31-04:00

[smooth, raster, sdf] Clean up initialization calls.

* src/raster/ftraster.c (ft_black_init): Removed.
(ft_black_new): Clean up.
* src/sdf/ftbsdf.c (bsdf_raster_new): Ditto.
* src/sdf/ftsdf.c (sdf_raster_new): Ditto.
* src/smooth/ftgrays.c (gray_raster_new): Ditto.

Changes:

src/autofit/afglobal.c

@@ -477,7 +477,7 @@
              /* IMPORTANT: Clear the error code, see
               * https://gitlab.freedesktop.org/freetype/freetype/-/issues/1063
               */
 -            error = 0;
 +            error = FT_Err_Ok;
              goto Again;
+           }

src/autofit/aflatin.c


       {
         if ( seg2->link != seg1 )
         {
-          seg1->link  = 0;
+          seg1->link  = NULL;
           seg1->serif = seg2->link;
         }
       }

src/bdf/bdflib.c

@@ -1924,7 +1924,7 @@
        p->font = font;
        font->memory = p->memory;
 -      p->memory    = 0;
 +      p->memory    = NULL;
        { /* setup */
          size_t           i;
@@ -2164,27 +2164,25 @@
    FT_LOCAL_DEF( FT_Error )
    bdf_load_font( FT_Stream       stream,
 -                 FT_Memory       extmemory,
 +                 FT_Memory       memory,
                   bdf_options_t*  opts,
                   bdf_font_t*    *font )
+   {
      unsigned long  lineno = 0; /* make compiler happy */
      _bdf_parse_t   *p     = NULL;
 -    FT_Memory  memory = extmemory; /* needed for FT_NEW */
      FT_Error   error  = FT_Err_Ok;
      if ( FT_NEW( p ) )
        goto Exit;
 -    memory    = NULL;
      p->opts   = (bdf_options_t*)( ( opts != 0 ) ? opts : &_bdf_opts );
      p->minlb  = 32767;
      p->size   = stream->size;
 -    p->memory = extmemory;  /* only during font creation */
 +    p->memory = memory;  /* only during font creation */
 -    _bdf_list_init( &p->list, extmemory );
 +    _bdf_list_init( &p->list, memory );
      error = _bdf_readstream( stream, _bdf_parse_start,
                               (void *)p, &lineno );
@@ -2275,8 +2273,6 @@
      if ( p->font != 0 )
+     {
        /* Make sure the comments are NULL terminated if they exist. */
 -      memory = p->font->memory;
+-
        if ( p->font->comments_len > 0 )
+       {
          if ( FT_QRENEW_ARRAY( p->font->comments,
@@ -2297,8 +2293,6 @@
+     {
        _bdf_list_done( &p->list );
 -      memory = extmemory;
+-
        FT_FREE( p->glyph_name );
        FT_FREE( p );
+     }
@@ -2308,8 +2302,6 @@
    Fail:
      bdf_free_font( p->font );
 -    memory = extmemory;
+-
      FT_FREE( p->font );
      goto Exit;

src/cache/ftcmanag.c

@@ -357,7 +357,7 @@
+   {
      FT_Error     error;
      FT_Memory    memory;
 -    FTC_Manager  manager = 0;
 +    FTC_Manager  manager;
      if ( !library )
@@ -368,7 +368,7 @@
      memory = library->memory;
 -    if ( FT_NEW( manager ) )
 +    if ( FT_QNEW( manager ) )
        goto Exit;
      if ( max_faces == 0 )
@@ -399,6 +399,9 @@
                        manager,
                        memory );
 +    manager->num_nodes  = 0;
 +    manager->num_caches = 0;
++
      *amanager = manager;
    Exit:

src/raster/ftraster.c

@@ -3133,13 +3133,6 @@
+   }
 -  static void
 -  ft_black_init( black_PRaster  raster )
 -  {
 -    FT_UNUSED( raster );
 -  }
+-
+-
    /**** RASTER OBJECT CREATION: In standalone mode, we simply use *****/
    /****                         a static object.                  *****/
@@ -3157,7 +3150,6 @@
       *araster = (FT_Raster)&the_raster;
       FT_ZERO( &the_raster );
 -     ft_black_init( &the_raster );
       return 0;
+   }
@@ -3179,17 +3171,13 @@
                  black_PRaster  *araster )
+   {
      FT_Error       error;
 -    black_PRaster  raster = NULL;
 +    black_PRaster  raster;
 -    *araster = 0;
      if ( !FT_NEW( raster ) )
 -    {
        raster->memory = memory;
 -      ft_black_init( raster );
 -      *araster = raster;
 -    }
 +    *araster = raster;
      return error;
+   }

src/sdf/ftbsdf.c

@@ -163,7 +163,7 @@
+   {
      FT_Memory  memory;
 -  } BSDF_TRaster;
 +  } BSDF_TRaster, *BSDF_PRaster;
    /**************************************************************************
@@ -1173,19 +1173,17 @@
    /* called when adding a new module through @FT_Add_Module */
    static FT_Error
 -  bsdf_raster_new( FT_Memory   memory,
 -                   FT_Raster*  araster )
 +  bsdf_raster_new( FT_Memory      memory,
 +                   BSDF_PRaster*  araster )
+   {
 -    FT_Error       error  = FT_Err_Ok;
 -    BSDF_TRaster*  raster = NULL;
 +    FT_Error      error;
 +    BSDF_PRaster  raster;
 -    *araster = 0;
 -    if ( !FT_ALLOC( raster, sizeof ( BSDF_TRaster ) ) )
 -    {
 +    if ( !FT_NEW( raster ) )
        raster->memory = memory;
 -      *araster       = (FT_Raster)raster;
 -    }
++
 +    *araster = raster;
      return error;
+   }

src/sdf/ftsdf.c

@@ -204,7 +204,7 @@
+   {
      FT_Memory  memory;
 -  } SDF_TRaster;
 +  } SDF_TRaster, *SDF_PRaster;
    /**************************************************************************
@@ -3706,25 +3706,19 @@
     */
    static FT_Error
 -  sdf_raster_new( FT_Memory   memory,
 -                  FT_Raster*  araster)
 +  sdf_raster_new( FT_Memory     memory,
 +                  SDF_PRaster*  araster )
+   {
 -    FT_Error      error  = FT_Err_Ok;
 -    SDF_TRaster*  raster = NULL;
 -    FT_Int        line   = __LINE__;
 +    FT_Error     error;
 +    SDF_PRaster  raster;
 -    /* in non-debugging mode this is not used */
 -    FT_UNUSED( line );
+-
 -    *araster = 0;
 -    if ( !FT_ALLOC( raster, sizeof ( SDF_TRaster ) ) )
 -    {
 +    if ( !FT_NEW( raster ) )
        raster->memory = memory;
 -      *araster       = (FT_Raster)raster;
 -    }
 -    return error;
 +    *araster = raster;
++
 +   return error;
+   }

src/smooth/ftgrays.c

@@ -2147,19 +2147,17 @@ typedef ptrdiff_t  FT_PtrDist;
  #else /* !STANDALONE_ */
    static int
 -  gray_raster_new( FT_Memory   memory,
 -                   FT_Raster*  araster )
 +  gray_raster_new( FT_Memory      memory,
 +                   gray_PRaster*  araster )
+   {
      FT_Error      error;
 -    gray_PRaster  raster = NULL;
 +    gray_PRaster  raster;
 -    *araster = 0;
 -    if ( !FT_ALLOC( raster, sizeof ( gray_TRaster ) ) )
 -    {
 +    if ( !FT_NEW( raster ) )
        raster->memory = memory;
 -      *araster       = (FT_Raster)raster;
 -    }
++
 +    *araster = raster;
      return error;
+   }

From:	Alexei Podtelezhnikov (@apodtele)
Subject:	[Git][freetype/freetype][master] 4 commits: Cosmetic zeros.
Date:	Fri, 03 Sep 2021 03:31:59 +0000

...	...	@@ -2109,7 +2109,7 @@
2109	2109	{
2110	2110	if ( seg2->link != seg1 )
2111	2111	{
2112		- seg1->link = 0;
	2112	+ seg1->link = NULL;
2113	2113	seg1->serif = seg2->link;
2114	2114	}
2115	2115	}