Update freetype to the latest version of Android external/freetype

include/freetype/internal/ftobjs.h

 /***************************************************************************/
 /*                                                                         */
 /*  ftobjs.h                                                               */
 /*                                                                         */
 /*    The FreeType private base classes (specification).                   */
 /*                                                                         */
-/*  Copyright 1996-2001, 2002, 2003, 2004, 2005, 2006, 2008, 2010 by       */
+/*  Copyright 1996-2006, 2008, 2010, 2012 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 218 matching lines @@
     clazz->size = size_;                                                     \
     clazz->init = init_;                                                     \
     clazz->done = done_;                                                     \
     clazz->char_index = char_index_;                                         \
     clazz->char_next = char_next_;                                           \
     clazz->char_var_index = char_var_index_;                                 \
     clazz->char_var_default = char_var_default_;                             \
     clazz->variant_list = variant_list_;                                     \
     clazz->charvariant_list = charvariant_list_;                             \
     clazz->variantchar_list = variantchar_list_;                             \
-  } 
+  }
 #endif /* FT_CONFIG_OPTION_PIC */
 
   /* create a new charmap and add it to charmap->face */
   FT_BASE( FT_Error )
   FT_CMap_New( FT_CMap_Class  clazz,
                FT_Pointer     init_data,
                FT_CharMap     charmap,
                FT_CMap       *acmap );
 
   /* destroy a charmap and remove it from face's list */
@@ skipping 172 matching lines @@
   /* <Description>                                                         */
   /*    A module object instance.                                          */
   /*                                                                       */
   /* <Fields>                                                              */
   /*    clazz   :: A pointer to the module's class.                        */
   /*                                                                       */
   /*    library :: A handle to the parent library object.                  */
   /*                                                                       */
   /*    memory  :: A handle to the memory manager.                         */
   /*                                                                       */
-  /*    generic :: A generic structure for user-level extensibility (?).   */
-  /*                                                                       */
   typedef struct  FT_ModuleRec_
   {
     FT_Module_Class*  clazz;
     FT_Library        library;
     FT_Memory         memory;
-    FT_Generic        generic;
 
   } FT_ModuleRec;
 
 
-  /* typecast an object to a FT_Module */
+  /* typecast an object to an FT_Module */
 #define FT_MODULE( x )          ((FT_Module)( x ))
 #define FT_MODULE_CLASS( x )    FT_MODULE( x )->clazz
 #define FT_MODULE_LIBRARY( x )  FT_MODULE( x )->library
 #define FT_MODULE_MEMORY( x )   FT_MODULE( x )->memory
 
 
 #define FT_MODULE_IS_DRIVER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
                                     FT_MODULE_FONT_DRIVER )
 
 #define FT_MODULE_IS_RENDERER( x )  ( FT_MODULE_CLASS( x )->module_flags & \
@@ skipping 242 matching lines @@
   /*  <Fields>                                                             */
   /*     root         :: Contains the fields of the root module class.     */
   /*                                                                       */
   /*     clazz        :: A pointer to the font driver's class.  Note that  */
   /*                     this is NOT root.clazz.  `class' wasn't used      */
   /*                     as it is a reserved word in C++.                  */
   /*                                                                       */
   /*     faces_list   :: The list of faces currently opened by this        */
   /*                     driver.                                           */
   /*                                                                       */
-  /*     extensions   :: A typeless pointer to the driver's extensions     */
-  /*                     registry, if they are supported through the       */
-  /*                     configuration macro FT_CONFIG_OPTION_EXTENSIONS.  */
-  /*                                                                       */
   /*     glyph_loader :: The glyph loader for all faces managed by this    */
   /*                     driver.  This object isn't defined for unscalable */
   /*                     formats.                                          */
   /*                                                                       */
   typedef struct  FT_DriverRec_
   {
     FT_ModuleRec     root;
     FT_Driver_Class  clazz;
-
     FT_ListRec       faces_list;
-    void*            extensions;
-
     FT_GlyphLoader   glyph_loader;
 
   } FT_DriverRec;
 
 
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
   /****                                                                 ****/
   /****                                                                 ****/
@@ skipping 29 matching lines @@
   /*                                                                       */
   /* <Description>                                                         */
   /*    The FreeType library class.  This is the root of all FreeType      */
   /*    data.  Use FT_New_Library() to create a library object, and        */
   /*    FT_Done_Library() to discard it and all child objects.             */
   /*                                                                       */
   /* <Fields>                                                              */
   /*    memory           :: The library's memory object.  Manages memory   */
   /*                        allocation.                                    */
   /*                                                                       */
-  /*    generic          :: Client data variable.  Used to extend the      */
-  /*                        Library class by higher levels and clients.    */
-  /*                                                                       */
   /*    version_major    :: The major version number of the library.       */
   /*                                                                       */
   /*    version_minor    :: The minor version number of the library.       */
   /*                                                                       */
   /*    version_patch    :: The current patch level of the library.        */
   /*                                                                       */
   /*    num_modules      :: The number of modules currently registered     */
   /*                        within this library.  This is set to 0 for new */
   /*                        libraries.  New modules are added through the  */
   /*                        FT_Add_Module() API function.                  */
@@ skipping 39 matching lines @@
   /*                        @FT_Library structure is created.              */
   /*                        @FT_Reference_Library increments this counter, */
   /*                        and @FT_Done_Library only destroys a library   */
   /*                        if the counter is~1, otherwise it simply       */
   /*                        decrements it.                                 */
   /*                                                                       */
   typedef struct  FT_LibraryRec_
   {
     FT_Memory          memory;           /* library's memory manager */
 
-    FT_Generic         generic;
-
     FT_Int             version_major;
     FT_Int             version_minor;
     FT_Int             version_patch;
 
     FT_UInt            num_modules;
     FT_Module          modules[FT_MAX_MODULES];  /* module objects  */
 
     FT_ListRec         renderers;        /* list of renderers        */
     FT_Renderer        cur_renderer;     /* current outline renderer */
     FT_Module          auto_hinter;
@@ skipping 116 matching lines @@
   /*                                                                       */
 #ifndef FT_CONFIG_OPTION_PIC
 
 #define FT_DEFINE_OUTLINE_FUNCS(class_, move_to_, line_to_, conic_to_,       \
                                 cubic_to_, shift_, delta_)                   \
   static const FT_Outline_Funcs class_ =                                     \
   {                                                                          \
     move_to_, line_to_, conic_to_, cubic_to_, shift_, delta_                 \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DEFINE_OUTLINE_FUNCS(class_, move_to_, line_to_, conic_to_,       \
                                 cubic_to_, shift_, delta_)                   \
   static FT_Error                                                            \
   Init_Class_##class_( FT_Outline_Funcs*  clazz )                            \
   {                                                                          \
     clazz->move_to = move_to_;                                               \
     clazz->line_to = line_to_;                                               \
     clazz->conic_to = conic_to_;                                             \
     clazz->cubic_to = cubic_to_;                                             \
     clazz->shift = shift_;                                                   \
     clazz->delta = delta_;                                                   \
     return FT_Err_Ok;                                                        \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /*************************************************************************/
   /*                                                                       */
   /* <Macro>                                                               */
   /*    FT_DEFINE_RASTER_FUNCS                                             */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Used to initialize an instance of FT_Raster_Funcs struct.          */
   /*    When FT_CONFIG_OPTION_PIC is defined an init funtion will need to  */
   /*    called with a pre-allocated stracture to be filled.                */
   /*    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
 
 #define FT_DEFINE_RASTER_FUNCS(class_, glyph_format_, raster_new_,           \
                                raster_reset_, raster_set_mode_,              \
                                raster_render_, raster_done_)                 \
   const FT_Raster_Funcs class_ =                                      \
   {                                                                          \
     glyph_format_, raster_new_, raster_reset_,                               \
     raster_set_mode_, raster_render_, raster_done_                           \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DEFINE_RASTER_FUNCS(class_, glyph_format_, raster_new_,           \
     raster_reset_, raster_set_mode_, raster_render_, raster_done_)           \
   void                                                                       \
   FT_Init_Class_##class_( FT_Raster_Funcs*  clazz )                          \
   {                                                                          \
     clazz->glyph_format = glyph_format_;                                     \
     clazz->raster_new = raster_new_;                                         \
     clazz->raster_reset = raster_reset_;                                     \
     clazz->raster_set_mode = raster_set_mode_;                               \
     clazz->raster_render = raster_render_;                                   \
     clazz->raster_done = raster_done_;                                       \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
   /****                                                                 ****/
   /****                                                                 ****/
   /****              PIC-Support Macros for ftrender.h                  ****/
   /****                                                                 ****/
   /****                                                                 ****/
   /*************************************************************************/
@@ skipping 18 matching lines @@
 #ifndef FT_CONFIG_OPTION_PIC
 
 #define FT_DEFINE_GLYPH(class_, size_, format_, init_, done_, copy_,         \
                         transform_, bbox_, prepare_)                         \
   FT_CALLBACK_TABLE_DEF                                                      \
   const FT_Glyph_Class class_ =                                              \
   {                                                                          \
     size_, format_, init_, done_, copy_, transform_, bbox_, prepare_         \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DEFINE_GLYPH(class_, size_, format_, init_, done_, copy_,         \
                         transform_, bbox_, prepare_)                         \
   void                                                                       \
   FT_Init_Class_##class_( FT_Glyph_Class*  clazz )                           \
   {                                                                          \
     clazz->glyph_size = size_;                                               \
     clazz->glyph_format = format_;                                           \
     clazz->glyph_init = init_;                                               \
     clazz->glyph_done = done_;                                               \
     clazz->glyph_copy = copy_;                                               \
     clazz->glyph_transform = transform_;                                     \
     clazz->glyph_bbox = bbox_;                                               \
     clazz->glyph_prepare = prepare_;                                         \
-  } 
+  }
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /*************************************************************************/
   /*                                                                       */
   /* <Macro>                                                               */
   /*    FT_DECLARE_RENDERER                                                */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Used to create a forward declaration of a                          */
   /*    FT_Renderer_Class stract instance.                                 */
   /*                                                                       */
   /* <Macro>                                                               */
   /*    FT_DEFINE_RENDERER                                                 */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Used to initialize an instance of FT_Renderer_Class struct.        */
   /*                                                                       */
   /*    When FT_CONFIG_OPTION_PIC is defined a Create funtion will need    */
   /*    to called with a pointer where the allocated stracture is returned.*/
   /*    And when it is no longer needed a Destroy function needs           */
   /*    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 renderer  */
+  /*    definition calling FT_DEFINE_RENDERER() 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
 
 #define FT_DECLARE_RENDERER(class_)                                          \
     FT_EXPORT_VAR( const FT_Renderer_Class ) class_;
 
@@ skipping 10 matching lines @@
     glyph_format_,                                                           \
                                                                              \
     render_glyph_,                                                           \
     transform_glyph_,                                                        \
     get_glyph_cbox_,                                                         \
     set_mode_,                                                               \
                                                                              \
     raster_class_                                                            \
   };
 
-#else /* FT_CONFIG_OPTION_PIC */ 
+#else /* FT_CONFIG_OPTION_PIC */
 
 #define FT_DECLARE_RENDERER(class_)  FT_DECLARE_MODULE(class_)
 
 #define FT_DEFINE_RENDERER(class_, \
                            flags_, size_, name_, version_, requires_,        \
                            interface_, init_, done_, get_interface_,         \
                            glyph_format_, render_glyph_, transform_glyph_,   \
                            get_glyph_cbox_, set_mode_, raster_class_ )       \
-  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_Renderer_Class* rclazz = (FT_Renderer_Class*)clazz;                   \
     FT_Memory         memory = library->memory;                              \
     class_##_pic_free( library );                                            \
     if ( rclazz )                                                            \
       FT_FREE( rclazz );                                                     \
@@ skipping 24 matching lines @@
                                                                              \
     clazz->render_glyph       = render_glyph_;                               \
     clazz->transform_glyph    = transform_glyph_;                            \
     clazz->get_glyph_cbox     = get_glyph_cbox_;                             \
     clazz->set_mode           = set_mode_;                                   \
                                                                              \
     clazz->raster_class       = raster_class_;                               \
                                                                              \
     *output_class = (FT_Module_Class*)clazz;                                 \
     return FT_Err_Ok;                                                        \
-  } 
+  }
 
 
 
-#endif /* FT_CONFIG_OPTION_PIC */ 
+#endif /* FT_CONFIG_OPTION_PIC */
 
   /*************************************************************************/
   /*************************************************************************/
   /*************************************************************************/
   /****                                                                 ****/
   /****                                                                 ****/
   /****              PIC-Support Macros for ftmodapi.h                  ****/
   /****                                                                 ****/
   /****                                                                 ****/
   /*************************************************************************/
@@ skipping 60 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 module    */
+  /*    definition calling FT_DEFINE_MODULE() 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).                                                          */
   /*                                                                       */
   /* <Macro>                                                               */
   /*    FT_DEFINE_ROOT_MODULE                                              */
   /*                                                                       */
   /* <Description>                                                         */
   /*    Used to initialize an instance of FT_Module_Class struct inside    */
@@ skipping 56 matching lines @@
     clazz->root.module_flags       = flags_;                                 \
     clazz->root.module_size        = size_;                                  \
     clazz->root.module_name        = name_;                                  \
     clazz->root.module_version     = version_;                               \
     clazz->root.module_requires    = requires_;                              \
                                                                              \
     clazz->root.module_interface   = interface_;                             \
                                                                              \
     clazz->root.module_init        = init_;                                  \
     clazz->root.module_done        = done_;                                  \
-    clazz->root.get_interface      = get_interface_;               
+    clazz->root.get_interface      = get_interface_;
 
 #define FT_DEFINE_MODULE(class_, flags_, size_, name_, version_, requires_,  \
                          interface_, init_, done_, get_interface_)           \
-  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;                                      \
     class_##_pic_free( library );                                            \
     if ( clazz )                                                             \
       FT_FREE( clazz );                                                      \
   }                                                                          \
@@ skipping 22 matching lines @@
     clazz->module_requires    = requires_;                                   \
                                                                              \
     clazz->module_interface   = interface_;                                  \
                                                                              \
     clazz->module_init        = init_;                                       \
     clazz->module_done        = done_;                                       \
     clazz->get_interface      = get_interface_;                              \
                                                                              \
     *output_class = clazz;                                                   \
     return FT_Err_Ok;                                                        \
-  } 
+  }
 
 #endif /* FT_CONFIG_OPTION_PIC */
 
 
 FT_END_HEADER
 
 #endif /* __FTOBJS_H__ */
 
 
 /* END */