[pshinter] Formatting.

This commit is contained in:
Werner Lemberg 2012-08-27 06:01:46 +02:00
parent d77b1ea012
commit 9a87937522
3 changed files with 23 additions and 18 deletions

View File

@ -4,7 +4,7 @@
/* */ /* */
/* FreeType PostScript hinter module implementation (body). */ /* FreeType PostScript hinter module implementation (body). */
/* */ /* */
/* Copyright 2001, 2002, 2007 by */ /* Copyright 2001, 2002, 2007, 2009, 2012 by */
/* David Turner, Robert Wilhelm, and Werner Lemberg. */ /* David Turner, Robert Wilhelm, and Werner Lemberg. */
/* */ /* */
/* 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, */
@ -93,14 +93,15 @@
} }
FT_DEFINE_PSHINTER_INTERFACE(pshinter_interface, FT_DEFINE_PSHINTER_INTERFACE(
pshinter_interface,
pshinter_get_globals_funcs, pshinter_get_globals_funcs,
pshinter_get_t1_funcs, pshinter_get_t1_funcs,
pshinter_get_t2_funcs pshinter_get_t2_funcs )
)
FT_DEFINE_MODULE(pshinter_module_class, FT_DEFINE_MODULE(
pshinter_module_class,
0, 0,
sizeof ( PS_Hinter_ModuleRec ), sizeof ( PS_Hinter_ModuleRec ),
@ -108,11 +109,11 @@
0x10000L, 0x10000L,
0x20000L, 0x20000L,
&FTPSHINTER_INTERFACE_GET, /* module-specific interface */ &FT_PSHINTER_INTERFACE_GET, /* module-specific interface */
(FT_Module_Constructor)ps_hinter_init, (FT_Module_Constructor)ps_hinter_init,
(FT_Module_Destructor) ps_hinter_done, (FT_Module_Destructor) ps_hinter_done,
(FT_Module_Requester) 0 /* no additional interface for now */ (FT_Module_Requester) NULL ) /* no additional interface for now */
)
/* END */ /* END */

View File

@ -4,7 +4,7 @@
/* */ /* */
/* The FreeType position independent code services for pshinter module. */ /* The FreeType position independent code services for pshinter module. */
/* */ /* */
/* Copyright 2009, 2010 by */ /* Copyright 2009, 2010, 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,6 +22,7 @@
#include "pshpic.h" #include "pshpic.h"
#include "pshnterr.h" #include "pshnterr.h"
#ifdef FT_CONFIG_OPTION_PIC #ifdef FT_CONFIG_OPTION_PIC
/* forward declaration of PIC init functions from pshmod.c */ /* forward declaration of PIC init functions from pshmod.c */
@ -63,13 +64,12 @@
FT_Init_Class_pshinter_interface( FT_Init_Class_pshinter_interface(
library, &container->pshinter_interface ); library, &container->pshinter_interface );
/*Exit:*/
if( error ) if( error )
pshinter_module_class_pic_free( library ); pshinter_module_class_pic_free( library );
return error; return error;
} }
#endif /* FT_CONFIG_OPTION_PIC */ #endif /* FT_CONFIG_OPTION_PIC */
/* END */ /* END */

View File

@ -4,7 +4,7 @@
/* */ /* */
/* The FreeType position independent code services for pshinter module. */ /* The FreeType position independent code services for pshinter module. */
/* */ /* */
/* Copyright 2009 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, */
@ -24,9 +24,10 @@ FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H #include FT_INTERNAL_PIC_H
#ifndef FT_CONFIG_OPTION_PIC #ifndef FT_CONFIG_OPTION_PIC
#define FTPSHINTER_INTERFACE_GET pshinter_interface #define FT_PSHINTER_INTERFACE_GET pshinter_interface
#else /* FT_CONFIG_OPTION_PIC */ #else /* FT_CONFIG_OPTION_PIC */
@ -35,10 +36,13 @@ FT_BEGIN_HEADER
typedef struct PSHinterPIC_ typedef struct PSHinterPIC_
{ {
PSHinter_Interface pshinter_interface; PSHinter_Interface pshinter_interface;
} PSHinterPIC; } PSHinterPIC;
#define GET_PIC( lib ) ( (PSHinterPIC*)((lib)->pic_container.autofit) ) #define GET_PIC( lib ) ( (PSHinterPIC*)((lib)->pic_container.autofit) )
#define FTPSHINTER_INTERFACE_GET (GET_PIC(library)->pshinter_interface)
#define FT_PSHINTER_INTERFACE_GET ( GET_PIC( library )->pshinter_interface )
/* see pshpic.c for the implementation */ /* see pshpic.c for the implementation */
void void