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

[sfnt] Formatting.

This commit is contained in:
Werner Lemberg 2012-08-24 13:10:08 +02:00
parent ee09c86163
commit 665c65bf86
2 changed files with 54 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/sfnt/sfntpic.c
View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for sfnt module. */
/* */
/* Copyright 2009, 2010 by */
/* Copyright 2009, 2010, 2012 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -22,6 +22,7 @@
#include "sfntpic.h"
#include "sferrors.h"
#ifdef FT_CONFIG_OPTION_PIC
/* forward declaration of PIC init functions from sfdriver.c */
@ -68,11 +69,12 @@
FT_Destroy_Class_tt_cmap_classes( FT_Library library,
TT_CMap_Class* clazz );
void
sfnt_module_class_pic_free( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_Memory memory = library->memory;
FT_Memory memory = library->memory;
if ( pic_container->sfnt )
@ -84,10 +86,12 @@
FT_Destroy_Class_sfnt_services( library,
container->sfnt_services );
container->sfnt_services = NULL;
if ( container->tt_cmap_classes )
FT_Destroy_Class_tt_cmap_classes( library,
container->tt_cmap_classes );
container->tt_cmap_classes = NULL;
FT_FREE( container );
pic_container->sfnt = NULL;
}
@ -95,12 +99,12 @@
FT_Error
sfnt_module_class_pic_init( FT_Library library )
sfnt_module_class_pic_init( FT_Library library )
{
FT_PIC_Container* pic_container = &library->pic_container;
FT_Error error = SFNT_Err_Ok;
FT_Error error = SFNT_Err_Ok;
sfntModulePIC* container;
FT_Memory memory = library->memory;
FT_Memory memory = library->memory;
/* allocate pointer, clear and set global container pointer */
@ -109,11 +113,13 @@
FT_MEM_SET( container, 0, sizeof ( *container ) );
pic_container->sfnt = container;
/* initialize pointer table - this is how the module usually expects this data */
/* initialize pointer table - */
/* this is how the module usually expects this data */
error = FT_Create_Class_sfnt_services( library,
&container->sfnt_services );
if ( error )
goto Exit;
error = FT_Create_Class_tt_cmap_classes( library,
&container->tt_cmap_classes );
if ( error )
@ -132,14 +138,12 @@
#endif
FT_Init_Class_sfnt_interface( library, &container->sfnt_interface );
Exit:
Exit:
if ( error )
sfnt_module_class_pic_free( library );
return error;
}
#endif /* FT_CONFIG_OPTION_PIC */

63
src/sfnt/sfntpic.h
View File

@ -4,7 +4,7 @@
/* */
/* The FreeType position independent code services for sfnt module. */
/* */
/* Copyright 2009 by */
/* Copyright 2009, 2012 by */
/* Oran Agra and Mickey Gabel. */
/* */
/* This file is part of the FreeType project, and may only be used, */
@ -24,7 +24,9 @@ FT_BEGIN_HEADER
#include FT_INTERNAL_PIC_H
#ifndef FT_CONFIG_OPTION_PIC
#ifndef FT_CONFIG_OPTION_PIC
#define FT_SFNT_SERVICES_GET sfnt_services
#define FT_SFNT_SERVICE_GLYPH_DICT_GET sfnt_service_glyph_dict
#define FT_SFNT_SERVICE_PS_NAME_GET sfnt_service_ps_name
@ -37,44 +39,61 @@ FT_BEGIN_HEADER
#else /* FT_CONFIG_OPTION_PIC */
/* some include files required for members of sfntModulePIC */
/* some include files required for members of sfntModulePIC */
#include FT_SERVICE_GLYPH_DICT_H
#include FT_SERVICE_POSTSCRIPT_NAME_H
#include FT_SERVICE_SFNT_H
#include FT_SERVICE_TT_CMAP_H
#ifdef TT_CONFIG_OPTION_BDF
#include "ttbdf.h"
#include FT_SERVICE_BDF_H
#endif
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_STREAM_H
#include FT_INTERNAL_SFNT_H
#include "ttcmap.h"
typedef struct sfntModulePIC_
typedef struct sfntModulePIC_
{
FT_ServiceDescRec* sfnt_services;
FT_Service_GlyphDictRec sfnt_service_glyph_dict;
FT_ServiceDescRec* sfnt_services;
FT_Service_GlyphDictRec sfnt_service_glyph_dict;
FT_Service_PsFontNameRec sfnt_service_ps_name;
FT_Service_TTCMapsRec tt_service_get_cmap_info;
TT_CMap_Class* tt_cmap_classes;
FT_Service_SFNT_TableRec sfnt_service_sfnt_table;
FT_Service_TTCMapsRec tt_service_get_cmap_info;
TT_CMap_Class* tt_cmap_classes;
FT_Service_SFNT_TableRec sfnt_service_sfnt_table;
#ifdef TT_CONFIG_OPTION_BDF
FT_Service_BDFRec sfnt_service_bdf;
FT_Service_BDFRec sfnt_service_bdf;
#endif
SFNT_Interface sfnt_interface;
SFNT_Interface sfnt_interface;
} sfntModulePIC;
#define GET_PIC(lib) ((sfntModulePIC*)((lib)->pic_container.sfnt))
#define FT_SFNT_SERVICES_GET (GET_PIC(library)->sfnt_services)
#define FT_SFNT_SERVICE_GLYPH_DICT_GET (GET_PIC(library)->sfnt_service_glyph_dict)
#define FT_SFNT_SERVICE_PS_NAME_GET (GET_PIC(library)->sfnt_service_ps_name)
#define FT_TT_SERVICE_GET_CMAP_INFO_GET (GET_PIC(library)->tt_service_get_cmap_info)
#define FT_SFNT_SERVICES_GET (GET_PIC(library)->sfnt_services)
#define FT_TT_CMAP_CLASSES_GET (GET_PIC(library)->tt_cmap_classes)
#define FT_SFNT_SERVICE_SFNT_TABLE_GET (GET_PIC(library)->sfnt_service_sfnt_table)
#define FT_SFNT_SERVICE_BDF_GET (GET_PIC(library)->sfnt_service_bdf)
#define FT_SFNT_INTERFACE_GET (GET_PIC(library)->sfnt_interface)
#define GET_PIC( lib ) \
( (sfntModulePIC*)((lib)->pic_container.sfnt) )
#define FT_SFNT_SERVICES_GET \
( GET_PIC( library )->sfnt_services )
#define FT_SFNT_SERVICE_GLYPH_DICT_GET \
( GET_PIC( library )->sfnt_service_glyph_dict )
#define FT_SFNT_SERVICE_PS_NAME_GET \
( GET_PIC( library )->sfnt_service_ps_name )
#define FT_TT_SERVICE_GET_CMAP_INFO_GET \
( GET_PIC( library )->tt_service_get_cmap_info )
#define FT_SFNT_SERVICES_GET \
( GET_PIC( library )->sfnt_services )
#define FT_TT_CMAP_CLASSES_GET \
( GET_PIC( library )->tt_cmap_classes )
#define FT_SFNT_SERVICE_SFNT_TABLE_GET \
( GET_PIC( library )->sfnt_service_sfnt_table )
#define FT_SFNT_SERVICE_BDF_GET \
( GET_PIC( library )->sfnt_service_bdf )
#define FT_SFNT_INTERFACE_GET \
( GET_PIC( library )->sfnt_interface )
/* see sfntpic.c for the implementation */
void
@ -85,7 +104,7 @@ typedef struct sfntModulePIC_
#endif /* FT_CONFIG_OPTION_PIC */
/* */
/* */
FT_END_HEADER