shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

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.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,5 +1,12 @@

 2013-03-17  Werner Lemberg  <[email protected]>

+	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  <[email protected]>

+

 	* src/pshinter/pshpic.h (GET_PIC): Use correct container.

 2013-03-15  Werner Lemberg  <[email protected]>

--- a/src/raster/rastpic.c

+++ b/src/raster/rastpic.c

@@ -22,6 +22,7 @@

 #include "rastpic.h"

 #include "rasterrs.h"

+

 #ifdef FT_CONFIG_OPTION_PIC

   /* forward declaration of PIC init functions from ftraster.c */

@@ -28,16 +29,19 @@

   void

   FT_Init_Class_ft_standard_raster( FT_Raster_Funcs*  funcs );

+

   void

   ft_raster1_renderer_class_pic_free( FT_Library  library )

   {

     FT_PIC_Container*  pic_container = &library->pic_container;

-    FT_Memory  memory = library->memory;

+    FT_Memory          memory        = library->memory;

     if ( pic_container->raster )

     {

-      RasterPIC* container = (RasterPIC*)pic_container->raster;

+      RasterPIC*  container = (RasterPIC*)pic_container->raster;

+

+

       if ( --container->ref_count )

         return;

       FT_FREE( container );

@@ -49,14 +53,14 @@

   FT_Error

   ft_raster1_renderer_class_pic_init( FT_Library  library )

   {

-    FT_PIC_Container* pic_container = &library->pic_container;

-    FT_Error          error         = FT_Err_Ok;

-    RasterPIC*        container     = NULL;

-    FT_Memory         memory        = library->memory;

+    FT_PIC_Container*  pic_container = &library->pic_container;

+    FT_Error           error         = FT_Err_Ok;

+    RasterPIC*         container     = NULL;

+    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 )

@@ -84,6 +89,7 @@

   {

     return ft_raster1_renderer_class_pic_init( library );

   }

+

   void

   ft_raster5_renderer_class_pic_free( FT_Library  library )

--- a/src/smooth/ftspic.c

+++ b/src/smooth/ftspic.c

@@ -22,6 +22,7 @@

 #include "ftspic.h"

 #include "ftsmerrs.h"

+

 #ifdef FT_CONFIG_OPTION_PIC

   /* forward declaration of PIC init functions from ftgrays.c */

@@ -28,11 +29,12 @@

   void

   FT_Init_Class_ft_grays_raster( FT_Raster_Funcs*  funcs );

+

   void

   ft_smooth_renderer_class_pic_free( FT_Library  library )

   {

     FT_PIC_Container*  pic_container = &library->pic_container;

-    FT_Memory  memory = library->memory;

+    FT_Memory          memory        = library->memory;

     if ( pic_container->smooth )

@@ -42,6 +44,7 @@

       if ( --container->ref_count )

         return;

+

       FT_FREE( container );

       pic_container->smooth = NULL;

     }

@@ -66,37 +69,45 @@

     }

     /* allocate pointer, clear and set global container pointer */

-    if ( FT_ALLOC ( container, sizeof ( *container ) ) )

+    if ( FT_ALLOC( container, sizeof ( *container ) ) )

       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 );

   }