forked from minhngoc25a/freetype2
Remove dead code.
* src/raster/rastpic.c (ft_raster1_renderer_class_pic_init) src/smooth/ftspic.c (ft_smooth_renderer_class_pic_init): Do it.
This commit is contained in:
parent
8b4459b858
commit
706fc83370
|
@ -1,3 +1,10 @@
|
|||
2013-03-17 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
Remove dead code.
|
||||
|
||||
* src/raster/rastpic.c (ft_raster1_renderer_class_pic_init)
|
||||
src/smooth/ftspic.c (ft_smooth_renderer_class_pic_init): Do it.
|
||||
|
||||
2013-03-17 Werner Lemberg <wl@gnu.org>
|
||||
|
||||
* src/pshinter/pshpic.h (GET_PIC): Use correct container.
|
||||
|
|
|
@ -22,12 +22,14 @@
|
|||
#include "rastpic.h"
|
||||
#include "rasterrs.h"
|
||||
|
||||
|
||||
#ifdef FT_CONFIG_OPTION_PIC
|
||||
|
||||
/* forward declaration of PIC init functions from ftraster.c */
|
||||
void
|
||||
FT_Init_Class_ft_standard_raster( FT_Raster_Funcs* funcs );
|
||||
|
||||
|
||||
void
|
||||
ft_raster1_renderer_class_pic_free( FT_Library library )
|
||||
{
|
||||
|
@ -38,6 +40,8 @@
|
|||
if ( pic_container->raster )
|
||||
{
|
||||
RasterPIC* container = (RasterPIC*)pic_container->raster;
|
||||
|
||||
|
||||
if ( --container->ref_count )
|
||||
return;
|
||||
FT_FREE( container );
|
||||
|
@ -55,8 +59,8 @@
|
|||
FT_Memory memory = library->memory;
|
||||
|
||||
|
||||
/* since this function also serve raster5 renderer,
|
||||
it implements reference counting */
|
||||
/* since this function also serves raster5 renderer, */
|
||||
/* it implements reference counting */
|
||||
if ( pic_container->raster )
|
||||
{
|
||||
((RasterPIC*)pic_container->raster)->ref_count++;
|
||||
|
@ -68,16 +72,17 @@
|
|||
return error;
|
||||
FT_MEM_SET( container, 0, sizeof ( *container ) );
|
||||
pic_container->raster = container;
|
||||
|
||||
container->ref_count = 1;
|
||||
|
||||
/* initialize pointer table - this is how the module usually expects this data */
|
||||
/* initialize pointer table - */
|
||||
/* this is how the module usually expects this data */
|
||||
FT_Init_Class_ft_standard_raster( &container->ft_standard_raster );
|
||||
/*Exit:*/
|
||||
if( error )
|
||||
ft_raster1_renderer_class_pic_free( library );
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
/* re-route these init and free functions to the above functions */
|
||||
FT_Error
|
||||
ft_raster5_renderer_class_pic_init( FT_Library library )
|
||||
|
@ -85,6 +90,7 @@
|
|||
return ft_raster1_renderer_class_pic_init( library );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
ft_raster5_renderer_class_pic_free( FT_Library library )
|
||||
{
|
||||
|
|
|
@ -22,12 +22,14 @@
|
|||
#include "ftspic.h"
|
||||
#include "ftsmerrs.h"
|
||||
|
||||
|
||||
#ifdef FT_CONFIG_OPTION_PIC
|
||||
|
||||
/* forward declaration of PIC init functions from ftgrays.c */
|
||||
void
|
||||
FT_Init_Class_ft_grays_raster( FT_Raster_Funcs* funcs );
|
||||
|
||||
|
||||
void
|
||||
ft_smooth_renderer_class_pic_free( FT_Library library )
|
||||
{
|
||||
|
@ -42,6 +44,7 @@
|
|||
|
||||
if ( --container->ref_count )
|
||||
return;
|
||||
|
||||
FT_FREE( container );
|
||||
pic_container->smooth = NULL;
|
||||
}
|
||||
|
@ -70,33 +73,41 @@
|
|||
return error;
|
||||
FT_MEM_SET( container, 0, sizeof ( *container ) );
|
||||
pic_container->smooth = container;
|
||||
|
||||
container->ref_count = 1;
|
||||
|
||||
/* initialize pointer table - this is how the module usually expects this data */
|
||||
/* initialize pointer table - */
|
||||
/* this is how the module usually expects this data */
|
||||
FT_Init_Class_ft_grays_raster( &container->ft_grays_raster );
|
||||
/*Exit:*/
|
||||
if ( error )
|
||||
ft_smooth_renderer_class_pic_free( library );
|
||||
|
||||
return error;
|
||||
}
|
||||
|
||||
|
||||
/* re-route these init and free functions to the above functions */
|
||||
FT_Error ft_smooth_lcd_renderer_class_pic_init( FT_Library library )
|
||||
FT_Error
|
||||
ft_smooth_lcd_renderer_class_pic_init( FT_Library library )
|
||||
{
|
||||
return ft_smooth_renderer_class_pic_init( library );
|
||||
}
|
||||
|
||||
void ft_smooth_lcd_renderer_class_pic_free( FT_Library library )
|
||||
|
||||
void
|
||||
ft_smooth_lcd_renderer_class_pic_free( FT_Library library )
|
||||
{
|
||||
ft_smooth_renderer_class_pic_free( library );
|
||||
}
|
||||
|
||||
FT_Error ft_smooth_lcdv_renderer_class_pic_init( FT_Library library )
|
||||
|
||||
FT_Error
|
||||
ft_smooth_lcdv_renderer_class_pic_init( FT_Library library )
|
||||
{
|
||||
return ft_smooth_renderer_class_pic_init( library );
|
||||
}
|
||||
|
||||
void ft_smooth_lcdv_renderer_class_pic_free( FT_Library library )
|
||||
|
||||
void
|
||||
ft_smooth_lcdv_renderer_class_pic_free( FT_Library library )
|
||||
{
|
||||
ft_smooth_renderer_class_pic_free( library );
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue