rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[autofit] Some macro and variable renamings for orthogonality. 

* include/freetype/internal/autohint.h, src/base/ftobjs.c,
src/autofit/afmodule.c, src/autofit/afpic.c, src/autofit/afpic.h:
s/SERVICE/INTERFACE/, s/service/interface/, s/Service/Interface/.
This commit is contained in:
Werner Lemberg 2012-08-27 06:57:05 +02:00
parent 9a87937522
commit d0841ea73b
6 changed files with 70 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2012-08-27 Werner Lemberg <wl@gnu.org>
[autofit] Some macro and variable renamings for orthogonality.
* include/freetype/internal/autohint.h, src/base/ftobjs.c,
src/autofit/afmodule.c, src/autofit/afpic.c, src/autofit/afpic.h:
s/SERVICE/INTERFACE/, s/service/interface/, s/Service/Interface/.
2012-08-26 Werner Lemberg <wl@gnu.org> 2012-08-26 Werner Lemberg <wl@gnu.org>
Fix Savannah bug #37178. Fix Savannah bug #37178.

64
include/freetype/internal/autohint.h
View File

@ -182,56 +182,56 @@ FT_BEGIN_HEADER
/*************************************************************************/ /*************************************************************************/
/* */ /* */
/* <Struct> */ /* <Struct> */
/* FT_AutoHinter_ServiceRec */ /* FT_AutoHinter_InterfaceRec */
/* */ /* */
/* <Description> */ /* <Description> */
/* The auto-hinter module's interface. */ /* The auto-hinter module's interface. */
/* */ /* */
typedef struct FT_AutoHinter_ServiceRec_ typedef struct FT_AutoHinter_InterfaceRec_
{ {
FT_AutoHinter_GlobalResetFunc reset_face; FT_AutoHinter_GlobalResetFunc reset_face;
FT_AutoHinter_GlobalGetFunc get_global_hints; FT_AutoHinter_GlobalGetFunc get_global_hints;
FT_AutoHinter_GlobalDoneFunc done_global_hints; FT_AutoHinter_GlobalDoneFunc done_global_hints;
FT_AutoHinter_GlyphLoadFunc load_glyph; FT_AutoHinter_GlyphLoadFunc load_glyph;
} FT_AutoHinter_ServiceRec, *FT_AutoHinter_Service; } FT_AutoHinter_InterfaceRec, *FT_AutoHinter_Interface;
#ifndef FT_CONFIG_OPTION_PIC #ifndef FT_CONFIG_OPTION_PIC
#define FT_DEFINE_AUTOHINTER_SERVICE( \ #define FT_DEFINE_AUTOHINTER_INTERFACE( \
class_, \ class_, \
reset_face_, \ reset_face_, \
get_global_hints_, \ get_global_hints_, \
done_global_hints_, \ done_global_hints_, \
load_glyph_ ) \ load_glyph_ ) \
FT_CALLBACK_TABLE_DEF \ FT_CALLBACK_TABLE_DEF \
const FT_AutoHinter_ServiceRec class_ = \ const FT_AutoHinter_InterfaceRec class_ = \
{ \ { \
reset_face_, \ reset_face_, \
get_global_hints_, \ get_global_hints_, \
done_global_hints_, \ done_global_hints_, \
load_glyph_ \ load_glyph_ \
}; };
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
#define FT_DEFINE_AUTOHINTER_SERVICE( \ #define FT_DEFINE_AUTOHINTER_INTERFACE( \
class_, \ class_, \
reset_face_, \ reset_face_, \
get_global_hints_, \ get_global_hints_, \
done_global_hints_, \ done_global_hints_, \
load_glyph_ ) \ load_glyph_ ) \
void \ void \
FT_Init_Class_ ## class_( FT_Library library, \ FT_Init_Class_ ## class_( FT_Library library, \
FT_AutoHinter_ServiceRec* clazz ) \ FT_AutoHinter_InterfaceRec* clazz ) \
{ \ { \
FT_UNUSED( library ); \ FT_UNUSED( library ); \
\ \
clazz->reset_face = reset_face_; \ clazz->reset_face = reset_face_; \
clazz->get_global_hints = get_global_hints_; \ clazz->get_global_hints = get_global_hints_; \
clazz->done_global_hints = done_global_hints_; \ clazz->done_global_hints = done_global_hints_; \
clazz->load_glyph = load_glyph_; \ clazz->load_glyph = load_glyph_; \
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */

7
src/autofit/afmodule.c
View File

@ -66,13 +66,14 @@
} }
FT_DEFINE_AUTOHINTER_SERVICE( FT_DEFINE_AUTOHINTER_INTERFACE(
af_autofitter_service, af_autofitter_interface,
NULL, /* reset_face */ NULL, /* reset_face */
NULL, /* get_global_hints */ NULL, /* get_global_hints */
NULL, /* done_global_hints */ NULL, /* done_global_hints */
(FT_AutoHinter_GlyphLoadFunc)af_autofitter_load_glyph ) /* load_glyph */ (FT_AutoHinter_GlyphLoadFunc)af_autofitter_load_glyph ) /* load_glyph */
FT_DEFINE_MODULE( FT_DEFINE_MODULE(
autofit_module_class, autofit_module_class,
@ -83,7 +84,7 @@
0x10000L, /* version 1.0 of the autofitter */ 0x10000L, /* version 1.0 of the autofitter */
0x20000L, /* requires FreeType 2.0 or above */ 0x20000L, /* requires FreeType 2.0 or above */
(const void*)&AF_AUTOFITTER_SERVICE_GET, (const void*)&AF_AUTOFITTER_INTERFACE_GET,
(FT_Module_Constructor)af_autofitter_init, (FT_Module_Constructor)af_autofitter_init,
(FT_Module_Destructor) af_autofitter_done, (FT_Module_Destructor) af_autofitter_done,

15
src/autofit/afpic.c
View File

@ -4,7 +4,7 @@
/* */ /* */
/* The FreeType position independent code services for autofit module. */ /* The FreeType position independent code services for autofit module. */
/* */ /* */
/* Copyright 2009, 2010, 2011 by */ /* Copyright 2009-2012 by */
/* Oran Agra and Mickey Gabel. */ /* Oran Agra and Mickey Gabel. */
/* */ /* */
/* This file is part of the FreeType project, and may only be used, */ /* This file is part of the FreeType project, and may only be used, */
@ -22,12 +22,13 @@
#include "afpic.h" #include "afpic.h"
#include "aferrors.h" #include "aferrors.h"
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
/* forward declaration of PIC init functions from afmodule.c */ /* forward declaration of PIC init functions from afmodule.c */
void FT_Init_Class_af_autofitter_service( void FT_Init_Class_af_autofitter_interface(
FT_Library library, FT_Library library,
FT_AutoHinter_ServiceRec* clazz ); FT_AutoHinter_InterfaceRec* clazz );
/* forward declaration of PIC init functions from script classes */ /* forward declaration of PIC init functions from script classes */
#include "aflatin.h" #include "aflatin.h"
@ -38,6 +39,7 @@
#include "afdummy.h" #include "afdummy.h"
#include "afindic.h" #include "afindic.h"
void void
autofit_module_class_pic_free( FT_Library library ) autofit_module_class_pic_free( FT_Library library )
{ {
@ -93,8 +95,8 @@
FT_Init_Class_af_indic_script_class( FT_Init_Class_af_indic_script_class(
&container->af_script_classes_rec[ss++] ); &container->af_script_classes_rec[ss++] );
FT_Init_Class_af_autofitter_service( FT_Init_Class_af_autofitter_interface(
library, &container->af_autofitter_service ); library, &container->af_autofitter_interface );
/* Exit: */ /* Exit: */
@ -103,7 +105,6 @@
return error; return error;
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */

26
src/autofit/afpic.h
View File

@ -24,10 +24,11 @@ FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H
#ifndef FT_CONFIG_OPTION_PIC #ifndef FT_CONFIG_OPTION_PIC
#define AF_SCRIPT_CLASSES_GET af_script_classes #define AF_SCRIPT_CLASSES_GET af_script_classes
#define AF_AUTOFITTER_SERVICE_GET af_autofitter_service #define AF_AUTOFITTER_INTERFACE_GET af_autofitter_interface
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
@ -36,26 +37,31 @@ FT_BEGIN_HEADER
/* increase these when you add new scripts, */ /* increase these when you add new scripts, */
/* and update autofit_module_class_pic_init */ /* and update autofit_module_class_pic_init */
#ifdef FT_OPTION_AUTOFIT2 #ifdef FT_OPTION_AUTOFIT2
#define AF_SCRIPT_CLASSES_COUNT 6 #define AF_SCRIPT_CLASSES_COUNT 6
#else #else
#define AF_SCRIPT_CLASSES_COUNT 5 #define AF_SCRIPT_CLASSES_COUNT 5
#endif #endif
#define AF_SCRIPT_CLASSES_REC_COUNT ( AF_SCRIPT_CLASSES_COUNT - 1 ) #define AF_SCRIPT_CLASSES_REC_COUNT ( AF_SCRIPT_CLASSES_COUNT - 1 )
typedef struct AFModulePIC_
typedef struct AFModulePIC_
{ {
AF_ScriptClass af_script_classes[AF_SCRIPT_CLASSES_COUNT]; AF_ScriptClass af_script_classes[AF_SCRIPT_CLASSES_COUNT];
AF_ScriptClassRec af_script_classes_rec[AF_SCRIPT_CLASSES_REC_COUNT]; AF_ScriptClassRec af_script_classes_rec[AF_SCRIPT_CLASSES_REC_COUNT];
FT_AutoHinter_ServiceRec af_autofitter_service; FT_AutoHinter_InterfaceRec af_autofitter_interface;
} AFModulePIC; } AFModulePIC;
#define GET_PIC( lib ) \ #define GET_PIC( lib ) \
( (AFModulePIC*)((lib)->pic_container.autofit) ) ( (AFModulePIC*)((lib)->pic_container.autofit) )
#define AF_SCRIPT_CLASSES_GET \ #define AF_SCRIPT_CLASSES_GET \
( GET_PIC( FT_FACE_LIBRARY(globals->face) )->af_script_classes ) ( GET_PIC( FT_FACE_LIBRARY(globals->face) )->af_script_classes )
#define AF_AUTOFITTER_SERVICE_GET \ #define AF_AUTOFITTER_INTERFACE_GET \
( GET_PIC( library )->af_autofitter_service ) ( GET_PIC( library )->af_autofitter_interface )
/* see afpic.c for the implementation */ /* see afpic.c for the implementation */
void void

4
src/base/ftobjs.c
View File

@ -651,7 +651,7 @@
if ( autohint ) if ( autohint )
{ {
FT_AutoHinter_Service hinting; FT_AutoHinter_Interface hinting;
/* try to load embedded bitmaps first if available */ /* try to load embedded bitmaps first if available */
@ -680,7 +680,7 @@
internal->transform_flags = 0; internal->transform_flags = 0;
/* load auto-hinted outline */ /* load auto-hinted outline */
hinting = (FT_AutoHinter_Service)hinter->clazz->module_interface; hinting = (FT_AutoHinter_Interface)hinter->clazz->module_interface;
error = hinting->load_glyph( (FT_AutoHinter)hinter, error = hinting->load_glyph( (FT_AutoHinter)hinter,
slot, face->size, slot, face->size,