[freetype2] master 91d5916: [raster] Remove last remnants of `raster5' driver.

[Werner LEMBERG]

branch: master
commit 91d59169a88dc983aef1dc6dc7abc7b27cc2f71d
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [raster] Remove last remnants of `raster5' driver.
    
    * src/raster/ftrend1.h (ft_raster5_renderer_class): Removed.
    
    * src/raster/rastpic.c, src/raster/rastpic.h
    (ft_raster5_renderer_class_pic_init,
    ft_raster5_renderer_class_pic_free): Removed.
---
 ChangeLog                   |   10 ++++++++++
 include/freetype/ftmodapi.h |    2 +-
 src/raster/ftrend1.h        |    6 ------
 src/raster/rastpic.c        |   20 +++-----------------
 src/raster/rastpic.h        |    6 ------
 5 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b3c0fd1..2fa7140 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2015-08-18  Werner Lemberg  <address@hidden>
+
+       [raster] Remove last remnants of `raster5' driver.
+
+       * src/raster/ftrend1.h (ft_raster5_renderer_class): Removed.
+
+       * src/raster/rastpic.c, src/raster/rastpic.h
+       (ft_raster5_renderer_class_pic_init,
+       ft_raster5_renderer_class_pic_free): Removed.
+
 2015-08-17  Alexei Podtelezhnikov  <address@hidden>
 
        [base] Improve emboldener (#45596).
diff --git a/include/freetype/ftmodapi.h b/include/freetype/ftmodapi.h
index 2ef3f46..544279a 100644
--- a/include/freetype/ftmodapi.h
+++ b/include/freetype/ftmodapi.h
@@ -63,7 +63,7 @@ FT_BEGIN_HEADER
   /*      psaux                                                            */
   /*      pshinter                                                         */
   /*      psnames                                                          */
-  /*      raster1, raster5                                                 */
+  /*      raster1                                                          */
   /*      sfnt                                                             */
   /*      smooth, smooth-lcd, smooth-lcdv                                  */
   /*      truetype                                                         */
diff --git a/src/raster/ftrend1.h b/src/raster/ftrend1.h
index c367260..edc5d13 100644
--- a/src/raster/ftrend1.h
+++ b/src/raster/ftrend1.h
@@ -29,12 +29,6 @@ FT_BEGIN_HEADER
 
   FT_DECLARE_RENDERER( ft_raster1_renderer_class )
 
-  /* this renderer is _NOT_ part of the default modules, you'll need */
-  /* to register it by hand in your application.  It should only be  */
-  /* used for backwards-compatibility with FT 1.x anyway.            */
-  /*                                                                 */
-  FT_DECLARE_RENDERER( ft_raster5_renderer_class )
-
 
 FT_END_HEADER
 
diff --git a/src/raster/rastpic.c b/src/raster/rastpic.c
index fe58c99..77e7ec3 100644
--- a/src/raster/rastpic.c
+++ b/src/raster/rastpic.c
@@ -59,8 +59,9 @@
     FT_Memory          memory        = library->memory;
 
 
-    /* since this function also serves raster5 renderer, */
-    /* it implements reference counting                  */
+    /* XXX: since this function also served the no longer available  */
+    /*      raster5 renderer it uses reference counting, which could */
+    /*      be removed now                                           */
     if ( pic_container->raster )
     {
       ((RasterPIC*)pic_container->raster)->ref_count++;
@@ -82,21 +83,6 @@
     return error;
   }
 
-
-  /* re-route these init and free functions to the above functions */
-  FT_Error
-  ft_raster5_renderer_class_pic_init( FT_Library  library )
-  {
-    return ft_raster1_renderer_class_pic_init( library );
-  }
-
-
-  void
-  ft_raster5_renderer_class_pic_free( FT_Library  library )
-  {
-    ft_raster1_renderer_class_pic_free( library );
-  }
-
 #endif /* FT_CONFIG_OPTION_PIC */
 
 
diff --git a/src/raster/rastpic.h b/src/raster/rastpic.h
index c12d75b..408996a 100644
--- a/src/raster/rastpic.h
+++ b/src/raster/rastpic.h
@@ -48,15 +48,9 @@ FT_BEGIN_HEADER
   void
   ft_raster1_renderer_class_pic_free( FT_Library  library );
 
-  void
-  ft_raster5_renderer_class_pic_free( FT_Library  library );
-
   FT_Error
   ft_raster1_renderer_class_pic_init( FT_Library  library );
 
-  FT_Error
-  ft_raster5_renderer_class_pic_init( FT_Library  library );
-
 #endif /* FT_CONFIG_OPTION_PIC */
 
  /* */