* include/freetype/internal/services/svcid.h add macros to init instances of FT_Service_CIDRec. * include/freetype/internal/services/svpsinfo.h add macros to init instances of FT_Service_PsInfoRec. * src/cff/cffcmap.h declare cff_cmap_encoding_class_rec and cff_cmap_unicode_class_rec using macros from ftobjs.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. * src/cff/cffcmap.c when FT_CONFIG_OPTION_PIC is defined the following structs: cff_cmap_encoding_class_rec and cff_cmap_unicode_class_rec will have functions to init or create and destroy them instead of being allocated in the global scope. * src/cff/cffdrivr.h declare cff_driver_class using macros from ftdriver.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. * src/cff/cffdrivr.c when FT_CONFIG_OPTION_PIC is defined the following structs: cff_service_glyph_dict, cff_service_ps_info, cff_service_ps_name cff_service_get_cmap_info, cff_service_cid_info, cff_driver_class, and cff_services array will have functions to init or create and destroy them instead of being allocated in the global scope. And macros will be used from cffpic.h in order to access them from the pic_container. Use macros from cffpic.h in order to access the structs allocated in cffcmap.c * src/cff/cffobjs.c Use macros from cffpic.h in order to access the structs allocated in cffcmap.c * src/cff/parser.c when FT_CONFIG_OPTION_PIC is defined implement functions to create and destroy cff_field_handlers array instead of being allocated in the global scope. And macros will be used from cffpic.h in order to access it from the pic_container. New Files: * src/cff/cffpic.h declare struct to hold PIC globals for cff driver and macros to access them. * src/cff/cffpic.c implement functions to allocate, destroy and initialize PIC globals for cff driver. * src/cff/cff.c add new file to build: cffpic.c. * src/cff/jamfile add new files to FT2_MULTI build: cffpic.c.david-pic-changes
Oran Agra
16 years ago
parent
fb429ec409
commit
cb3b61416b
13 changed files with 439 additions and 75 deletions
@ -0,0 +1,99 @@ |
||||
/***************************************************************************/ |
||||
/* */ |
||||
/* cffpic.c */ |
||||
/* */ |
||||
/* The FreeType position independent code services for cff module. */ |
||||
/* */ |
||||
/* Copyright 2009 by */ |
||||
/* Oran Agra and Mickey Gabel. */ |
||||
/* */ |
||||
/* 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. */ |
||||
/* */ |
||||
/***************************************************************************/ |
||||
|
||||
|
||||
#include <ft2build.h> |
||||
#include FT_FREETYPE_H |
||||
#include FT_INTERNAL_OBJECTS_H |
||||
#include "cffpic.h" |
||||
|
||||
#ifdef FT_CONFIG_OPTION_PIC |
||||
|
||||
/* forward declaration of PIC init functions from cffdrivr.c */ |
||||
FT_Error FT_Create_Class_cff_services( FT_Library, FT_ServiceDescRec**); |
||||
void FT_Destroy_Class_cff_services( FT_Library, FT_ServiceDescRec*); |
||||
void FT_Init_Class_cff_service_ps_info( FT_Library, FT_Service_PsInfoRec*); |
||||
void FT_Init_Class_cff_service_glyph_dict( FT_Library, FT_Service_GlyphDictRec*); |
||||
void FT_Init_Class_cff_service_ps_name( FT_Library, FT_Service_PsFontNameRec*); |
||||
void FT_Init_Class_cff_service_get_cmap_info( FT_Library, FT_Service_TTCMapsRec*); |
||||
void FT_Init_Class_cff_service_cid_info( FT_Library, FT_Service_CIDRec*); |
||||
|
||||
/* forward declaration of PIC init functions from cffparse.c */ |
||||
FT_Error FT_Create_Class_cff_field_handlers( FT_Library, CFF_Field_Handler**); |
||||
void FT_Destroy_Class_cff_field_handlers( FT_Library, CFF_Field_Handler*); |
||||
|
||||
/* forward declaration of PIC init functions from cffcmap.c */ |
||||
void FT_Init_Class_cff_cmap_encoding_class_rec( FT_Library, FT_CMap_ClassRec*); |
||||
void FT_Init_Class_cff_cmap_unicode_class_rec( FT_Library, FT_CMap_ClassRec*); |
||||
|
||||
void |
||||
cff_driver_class_pic_free( FT_Library library ) |
||||
{ |
||||
FT_PIC_Container* pic_container = &library->pic_container; |
||||
FT_Memory memory = library->memory; |
||||
if ( pic_container->cff ) |
||||
{ |
||||
CffModulePIC* container = (CffModulePIC*)pic_container->cff; |
||||
if(container->cff_services) |
||||
FT_Destroy_Class_cff_services(library, container->cff_services); |
||||
container->cff_services = NULL; |
||||
if(container->cff_field_handlers) |
||||
FT_Destroy_Class_cff_field_handlers(library, container->cff_field_handlers); |
||||
container->cff_field_handlers = NULL; |
||||
FT_FREE( container ); |
||||
pic_container->cff = NULL; |
||||
} |
||||
} |
||||
|
||||
FT_Error |
||||
cff_driver_class_pic_init( FT_Library library ) |
||||
{ |
||||
FT_PIC_Container* pic_container = &library->pic_container; |
||||
FT_Error error = FT_Err_Ok; |
||||
CffModulePIC* container; |
||||
FT_Memory memory = library->memory; |
||||
|
||||
/* allocate pointer, clear and set global container pointer */ |
||||
if ( FT_ALLOC ( container, sizeof ( *container ) ) ) |
||||
return error; |
||||
FT_MEM_SET( container, 0, sizeof(*container) ); |
||||
pic_container->cff = container; |
||||
|
||||
/* initialize pointer table - this is how the module usually expects this data */ |
||||
error = FT_Create_Class_cff_services(library, &container->cff_services); |
||||
if(error)
|
||||
goto Exit; |
||||
error = FT_Create_Class_cff_field_handlers(library, &container->cff_field_handlers); |
||||
if(error)
|
||||
goto Exit; |
||||
FT_Init_Class_cff_service_ps_info(library, &container->cff_service_ps_info); |
||||
FT_Init_Class_cff_service_glyph_dict(library, &container->cff_service_glyph_dict); |
||||
FT_Init_Class_cff_service_ps_name(library, &container->cff_service_ps_name); |
||||
FT_Init_Class_cff_service_get_cmap_info(library, &container->cff_service_get_cmap_info); |
||||
FT_Init_Class_cff_service_cid_info(library, &container->cff_service_cid_info); |
||||
FT_Init_Class_cff_cmap_encoding_class_rec(library, &container->cff_cmap_encoding_class_rec); |
||||
FT_Init_Class_cff_cmap_unicode_class_rec(library, &container->cff_cmap_unicode_class_rec); |
||||
Exit: |
||||
if(error) |
||||
cff_driver_class_pic_free(library); |
||||
return error; |
||||
} |
||||
|
||||
#endif /* FT_CONFIG_OPTION_PIC */ |
||||
|
||||
|
||||
/* END */ |
||||
@ -0,0 +1,80 @@ |
||||
/***************************************************************************/ |
||||
/* */ |
||||
/* cffpic.h */ |
||||
/* */ |
||||
/* The FreeType position independent code services for cff module. */ |
||||
/* */ |
||||
/* Copyright 2009 by */ |
||||
/* Oran Agra and Mickey Gabel. */ |
||||
/* */ |
||||
/* 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. */ |
||||
/* */ |
||||
/***************************************************************************/ |
||||
|
||||
|
||||
#ifndef __CFFPIC_H__ |
||||
#define __CFFPIC_H__ |
||||
|
||||
|
||||
FT_BEGIN_HEADER |
||||
|
||||
#include FT_INTERNAL_PIC_H |
||||
|
||||
#ifndef FT_CONFIG_OPTION_PIC |
||||
#define FT_CFF_SERVICE_PS_INFO_GET cff_service_ps_info |
||||
#define FT_CFF_SERVICE_GLYPH_DICT_GET cff_service_glyph_dict |
||||
#define FT_CFF_SERVICE_PS_NAME_GET cff_service_ps_name |
||||
#define FT_CFF_SERVICE_GET_CMAP_INFO_GET cff_service_get_cmap_info |
||||
#define FT_CFF_SERVICE_CID_INFO_GET cff_service_cid_info |
||||
#define FT_CFF_SERVICES_GET cff_services |
||||
#define FT_CFF_CMAP_ENCODING_CLASS_REC_GET cff_cmap_encoding_class_rec |
||||
#define FT_CFF_CMAP_UNICODE_CLASS_REC_GET cff_cmap_unicode_class_rec |
||||
#define FT_CFF_FIELD_HANDLERS_GET cff_field_handlers |
||||
|
||||
#else /* FT_CONFIG_OPTION_PIC */ |
||||
|
||||
#include FT_SERVICE_GLYPH_DICT_H |
||||
#include "cffparse.h" |
||||
#include FT_SERVICE_POSTSCRIPT_INFO_H |
||||
#include FT_SERVICE_POSTSCRIPT_NAME_H |
||||
#include FT_SERVICE_TT_CMAP_H |
||||
#include FT_SERVICE_CID_H |
||||
|
||||
typedef struct CffModulePIC_ |
||||
{ |
||||
FT_ServiceDescRec* cff_services; |
||||
CFF_Field_Handler* cff_field_handlers; |
||||
FT_Service_PsInfoRec cff_service_ps_info; |
||||
FT_Service_GlyphDictRec cff_service_glyph_dict; |
||||
FT_Service_PsFontNameRec cff_service_ps_name; |
||||
FT_Service_TTCMapsRec cff_service_get_cmap_info; |
||||
FT_Service_CIDRec cff_service_cid_info; |
||||
FT_CMap_ClassRec cff_cmap_encoding_class_rec; |
||||
FT_CMap_ClassRec cff_cmap_unicode_class_rec; |
||||
} CffModulePIC; |
||||
|
||||
#define GET_PIC(lib) ((CffModulePIC*)((lib)->pic_container.cff)) |
||||
#define FT_CFF_SERVICE_PS_INFO_GET (GET_PIC(library)->cff_service_ps_info) |
||||
#define FT_CFF_SERVICE_GLYPH_DICT_GET (GET_PIC(library)->cff_service_glyph_dict) |
||||
#define FT_CFF_SERVICE_PS_NAME_GET (GET_PIC(library)->cff_service_ps_name) |
||||
#define FT_CFF_SERVICE_GET_CMAP_INFO_GET (GET_PIC(library)->cff_service_get_cmap_info) |
||||
#define FT_CFF_SERVICE_CID_INFO_GET (GET_PIC(library)->cff_service_cid_info) |
||||
#define FT_CFF_SERVICES_GET (GET_PIC(library)->cff_services) |
||||
#define FT_CFF_CMAP_ENCODING_CLASS_REC_GET (GET_PIC(library)->cff_cmap_encoding_class_rec) |
||||
#define FT_CFF_CMAP_UNICODE_CLASS_REC_GET (GET_PIC(library)->cff_cmap_unicode_class_rec) |
||||
#define FT_CFF_FIELD_HANDLERS_GET (GET_PIC(library)->cff_field_handlers) |
||||
|
||||
#endif /* FT_CONFIG_OPTION_PIC */ |
||||
|
||||
/* */ |
||||
|
||||
FT_END_HEADER |
||||
|
||||
#endif /* __CFFPIC_H__ */ |
||||
|
||||
|
||||
/* END */ |
||||
Loading…
Reference in new issue