Update freetype to the latest version of Android external/freetype

include/freetype/internal/ftdriver.h

 /***************************************************************************/
 /*                                                                         */
 /*  ftdriver.h                                                             */
 /*                                                                         */
 /*    FreeType font driver interface (specification).                      */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2006, 2008 by                         */
+/*  Copyright 1996-2003, 2006, 2008, 2011 by                               */
 /*  David Turner, Robert Wilhelm, and Werner Lemberg.                      */
 /*                                                                         */
 /*  This file is part of the FreeType project, and may only be used,       */
 /*  modified, and distributed under the terms of the FreeType project      */
 /*  license, LICENSE.TXT.  By continuing to use, modify, or distribute     */
 /*  this file you indicate that you have read the license and              */
 /*  understand and accept it fully.                                        */
 /*                                                                         */
 /***************************************************************************/
 
@@ skipping 137 matching lines @@
   /*                        additional data for a face from another        */
   /*                        file/stream.  For example, this can be used to */
   /*                        add data from AFM or PFM files on a Type 1     */
   /*                        face, or a CIDMap on a CID-keyed face.         */
   /*                                                                       */
   /*    get_advances     :: A function handle used to return advance       */
   /*                        widths of `count' glyphs (in font units),      */
   /*                        starting at `first'.  The `vertical' flag must */
   /*                        be set to get vertical advance heights.  The   */
   /*                        `advances' buffer is caller-allocated.         */
-  /*                        Currently not implemented.  The idea of this   */
-  /*                        function is to be able to perform              */
-  /*                        device-independent text layout without loading */
-  /*                        a single glyph image.                          */
+  /*                        The idea of this function is to be able to     */
+  /*                        perform device-independent text layout without */
+  /*                        loading a single glyph image.                  */
   /*                                                                       */
   /*    request_size     :: A handle to a function used to request the new */
   /*                        character size.  Can be set to 0 if the        */
   /*                        scaling done in the base layer suffices.       */
   /*                                                                       */
   /*    select_size      :: A handle to a function used to select a new    */
   /*                        fixed size.  It is used only if                */
   /*                        @FT_FACE_FLAG_FIXED_SIZES is set.  Can be set  */
   /*                        to 0 if the scaling done in the base layer     */
   /*                        suffices.                                      */
@@ skipping 82 matching lines @@
   /*    to be called to release that allocation.                           */
   /*    fcinit.c (ft_create_default_module_classes) already contains       */
   /*    a mechanism to call these functions for the default modules        */
   /*    described in ftmodule.h                                            */
   /*                                                                       */
   /*    Notice that the created Create and Destroy functions call          */
   /*    pic_init and pic_free function to allow you to manually allocate   */
   /*    and initialize any additional global data, like module specific    */
   /*    interface, and put them in the global pic container defined in     */
   /*    ftpic.h. if you don't need them just implement the functions as    */
-  /*    empty to resolve the link error.                                   */
+  /*    empty to resolve the link error.  Also the pic_init and pic_free   */
+  /*    functions should be declared in pic.h, to be referred by driver    */
+  /*    definition calling FT_DEFINE_DRIVER() in following.                */
   /*                                                                       */
   /*    When FT_CONFIG_OPTION_PIC is not defined the struct will be        */
   /*    allocated in the global scope (or the scope where the macro        */
   /*    is used).                                                          */
   /*                                                                       */
 #ifndef FT_CONFIG_OPTION_PIC
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
 #define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) \
   a_, b_,
 #else
   #define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_)
 #endif
 
 #define FT_DECLARE_DRIVER(class_)    \
   FT_CALLBACK_TABLE                  \
-  const FT_Driver_ClassRec  class_;  
+  const FT_Driver_ClassRec  class_;
 
 #define FT_DEFINE_DRIVER(class_,                                             \
                          flags_, size_, name_, version_, requires_,          \
                          interface_, init_, done_, get_interface_,           \
                          face_object_size_, size_object_size_,               \
                          slot_object_size_, init_face_, done_face_,          \
                          init_size_, done_size_, init_slot_, done_slot_,     \
                          old_set_char_sizes_, old_set_pixel_sizes_,          \
                          load_glyph_, get_kerning_, attach_file_,            \
                          get_advances_, request_size_, select_size_ )        \
@@ skipping 21 matching lines @@
     load_glyph_,                                                             \
                                                                              \
     get_kerning_,                                                            \
     attach_file_,                                                            \
     get_advances_,                                                           \
                                                                              \
     request_size_,                                                           \
     select_size_                                                             \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #ifdef FT_CONFIG_OPTION_OLD_INTERNALS
 #define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_) \
   clazz->set_char_sizes = a_; \
   clazz->set_pixel_sizes = b_;
 #else
   #define FT_DEFINE_DRIVERS_OLD_INTERNALS(a_,b_)
 #endif
 
 #define FT_DECLARE_DRIVER(class_)    FT_DECLARE_MODULE(class_)
 
 #define FT_DEFINE_DRIVER(class_,                                             \
                          flags_, size_, name_, version_, requires_,          \
                          interface_, init_, done_, get_interface_,           \
                          face_object_size_, size_object_size_,               \
                          slot_object_size_, init_face_, done_face_,          \
                          init_size_, done_size_, init_slot_, done_slot_,     \
                          old_set_char_sizes_, old_set_pixel_sizes_,          \
                          load_glyph_, get_kerning_, attach_file_,            \
                          get_advances_, request_size_, select_size_ )        \
-  void class_##_pic_free( FT_Library library );                              \
-  FT_Error class_##_pic_init( FT_Library library );                          \
                                                                              \
   void                                                                       \
   FT_Destroy_Class_##class_( FT_Library        library,                      \
                              FT_Module_Class*  clazz )                       \
   {                                                                          \
     FT_Memory       memory = library->memory;                                \
     FT_Driver_Class dclazz = (FT_Driver_Class)clazz;                         \
     class_##_pic_free( library );                                            \
     if ( dclazz )                                                            \
       FT_FREE( dclazz );                                                     \
@@ skipping 39 matching lines @@
                                                                              \
     clazz->get_kerning         = get_kerning_;                               \
     clazz->attach_file         = attach_file_;                               \
     clazz->get_advances        = get_advances_;                              \
                                                                              \
     clazz->request_size        = request_size_;                              \
     clazz->select_size         = select_size_;                               \
                                                                              \
     *output_class = (FT_Module_Class*)clazz;                                 \
     return FT_Err_Ok;                                                        \
-  }                
+  }
 
 
 #endif /* FT_CONFIG_OPTION_PIC */
 
 FT_END_HEADER
 
 #endif /* __FTDRIVER_H__ */
 
 
 /* END */