minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[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.
This commit is contained in:
Alexei Podtelezhnikov 2021-09-02 23:30:31 -04:00
parent a7b199d081
commit 7f8f0c1c70
4 changed files with 25 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/raster/ftraster.c
View File

@ -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;
}

18
src/sdf/ftbsdf.c
View File

@ -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;
}

24
src/sdf/ftsdf.c
View File

@ -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__;
/* in non-debugging mode this is not used */
FT_UNUSED( line );
FT_Error error;
SDF_PRaster raster;
*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;
}

14
src/smooth/ftgrays.c
View File

@ -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;
}