ref: 7f8f0c1c70595f65900424a75ec668f68d2f249d
parent: a7b199d081e73aad69f97e71ba46b289bfa1692a
author: Alexei Podtelezhnikov <[email protected]>
date: Thu Sep 2 19:30:31 EDT 2021
[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.
--- a/src/raster/ftraster.c
+++ b/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;
}
--- a/src/sdf/ftbsdf.c
+++ b/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;
}
--- a/src/sdf/ftsdf.c
+++ b/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;
}
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -2147,19 +2147,17 @@
#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;
}