* include/freetype/internal/autohint.h add macros to init instances of FT_AutoHinter_ServiceRec. * src/autofit/afmodule.h declare autofit_module_class using macros from ftmodapi.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. * src/autofit/afmodule.c when FT_CONFIG_OPTION_PIC is defined af_autofitter_service and autofit_module_class structs will have functions to init or create and destroy them instead of being allocated in the global scope. And macros will be used from afpic.h in order to access them. * src/autofit/aftypes.h add macros to init and declare instances of AF_ScriptClassRec. * src/autofit/afcjk.h declare af_cjk_script_class using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. * src/autofit/afcjk.c when FT_CONFIG_OPTION_PIC is defined af_cjk_script_class struct will have function to init it instead of being allocated in the global scope. * src/autofit/afdummy.h declare af_dummy_script_class using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. * src/autofit/afdummy.c when FT_CONFIG_OPTION_PIC is defined af_dummy_script_class struct will have function to init it instead of being allocated in the global scope. * src/autofit/afindic.h declare af_indic_script_class using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. * src/autofit/afindic.c when FT_CONFIG_OPTION_PIC is defined af_indic_script_class struct will have function to init it instead of being allocated in the global scope. * src/autofit/aflatin.h declare af_latin_script_class using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. * src/autofit/aflatin.c when FT_CONFIG_OPTION_PIC is defined af_latin_script_class struct will have function to init it instead of being allocated in the global scope. Change af_latin_blue_chars to be PIC-compatible by being a two dimentional array rather than array of pointers. * src/autofit/aflatin2.h declare af_latin2_script_class using macros from aftypes.h, when FT_CONFIG_OPTION_PIC is defined init function will be declared. * src/autofit/aflatin2.c when FT_CONFIG_OPTION_PIC is defined af_latin2_script_class struct will have function to init it instead of being allocated in the global scope. Change af_latin2_blue_chars to be PIC-compatible by being a two dimentional array rather than array of pointers. * src/autofit/afglobal.c when FT_CONFIG_OPTION_PIC is defined af_script_classes array initialization was moved to afpic.c and is later refered using macros defeined in afpic.h. New Files: * src/autofit/afpic.h declare struct to hold PIC globals for autofit module and macros to access them. * src/autofit/afpic.c implement functions to allocate, destroy and initialize PIC globals for autofit module. * src/autofit/autofit.c add new file to build: afpic.c. * src/autofit/jamfile add new files to FT2_MULTI build: afpic.c.david-pic-changes
Oran Agra
16 years ago
parent
4e711be9f5
commit
59b4af8d59
20 changed files with 349 additions and 58 deletions
@ -0,0 +1,92 @@ |
||||
/***************************************************************************/ |
||||
/* */ |
||||
/* afpic.c */ |
||||
/* */ |
||||
/* The FreeType position independent code services for autofit 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 "afpic.h" |
||||
|
||||
#ifdef FT_CONFIG_OPTION_PIC |
||||
|
||||
/* forward declaration of PIC init functions from afmodule.c */ |
||||
void FT_Init_Class_af_autofitter_service( FT_Library, FT_AutoHinter_ServiceRec*); |
||||
|
||||
/* forward declaration of PIC init functions from script classes */ |
||||
#include "aflatin.h" |
||||
#include "aflatin2.h" |
||||
#include "afcjk.h" |
||||
#include "afdummy.h" |
||||
#include "afindic.h" |
||||
|
||||
void |
||||
autofit_module_class_pic_free( FT_Library library ) |
||||
{ |
||||
FT_PIC_Container* pic_container = &library->pic_container; |
||||
FT_Memory memory = library->memory; |
||||
if ( pic_container->autofit ) |
||||
{ |
||||
FT_FREE( pic_container->autofit ); |
||||
pic_container->autofit = NULL; |
||||
} |
||||
} |
||||
|
||||
FT_Error |
||||
autofit_module_class_pic_init( FT_Library library ) |
||||
{ |
||||
FT_PIC_Container* pic_container = &library->pic_container; |
||||
FT_UInt ss; |
||||
FT_Error error = FT_Err_Ok; |
||||
AFModulePIC* 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->autofit = container; |
||||
|
||||
/* initialize pointer table - this is how the module usually expects this data */ |
||||
for ( ss = 0 ; ss < AF_SCRIPT_CLASSES_REC_COUNT ; ss++ ) |
||||
{ |
||||
container->af_script_classes[ss] = &container->af_script_classes_rec[ss]; |
||||
} |
||||
container->af_script_classes[AF_SCRIPT_CLASSES_COUNT-1] = NULL; |
||||
|
||||
/* add call to initialization function when you add new scripts */ |
||||
ss = 0; |
||||
FT_Init_Class_af_dummy_script_class(&container->af_script_classes_rec[ss++]); |
||||
#ifdef FT_OPTION_AUTOFIT2 |
||||
FT_Init_Class_af_latin2_script_class(&container->af_script_classes_rec[ss++]); |
||||
#endif |
||||
FT_Init_Class_af_latin_script_class(&container->af_script_classes_rec[ss++]); |
||||
FT_Init_Class_af_cjk_script_class(&container->af_script_classes_rec[ss++]); |
||||
FT_Init_Class_af_indic_script_class(&container->af_script_classes_rec[ss++]);
|
||||
|
||||
FT_Init_Class_af_autofitter_service(library, &container->af_autofitter_service); |
||||
|
||||
/*Exit:*/ |
||||
if(error) |
||||
autofit_module_class_pic_free(library); |
||||
return error; |
||||
} |
||||
|
||||
|
||||
#endif /* FT_CONFIG_OPTION_PIC */ |
||||
|
||||
|
||||
/* END */ |
||||
@ -0,0 +1,64 @@ |
||||
/***************************************************************************/ |
||||
/* */ |
||||
/* afpic.h */ |
||||
/* */ |
||||
/* The FreeType position independent code services for autofit 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 __AFPIC_H__ |
||||
#define __AFPIC_H__ |
||||
|
||||
|
||||
FT_BEGIN_HEADER |
||||
|
||||
#include FT_INTERNAL_PIC_H |
||||
|
||||
#ifndef FT_CONFIG_OPTION_PIC |
||||
|
||||
#define AF_SCRIPT_CLASSES_GET af_script_classes |
||||
#define AF_AF_AUTOFITTER_SERVICE_GET af_autofitter_service |
||||
|
||||
#else /* FT_CONFIG_OPTION_PIC */ |
||||
|
||||
#include "aftypes.h" |
||||
|
||||
/* increase these when you add new scripts, and update autofit_module_class_pic_init */ |
||||
#ifdef FT_OPTION_AUTOFIT2 |
||||
#define AF_SCRIPT_CLASSES_COUNT 6 |
||||
#else |
||||
#define AF_SCRIPT_CLASSES_COUNT 5 |
||||
#endif |
||||
#define AF_SCRIPT_CLASSES_REC_COUNT (AF_SCRIPT_CLASSES_COUNT-1) |
||||
|
||||
typedef struct AFModulePIC_ |
||||
{ |
||||
AF_ScriptClass af_script_classes[AF_SCRIPT_CLASSES_COUNT]; |
||||
AF_ScriptClassRec af_script_classes_rec[AF_SCRIPT_CLASSES_REC_COUNT]; |
||||
FT_AutoHinter_ServiceRec af_autofitter_service; |
||||
} AFModulePIC; |
||||
|
||||
#define GET_PIC(lib) ((AFModulePIC*)((lib)->pic_container.autofit)) |
||||
#define AF_SCRIPT_CLASSES_GET (GET_PIC(FT_FACE_LIBRARY(globals->face))->af_script_classes) |
||||
#define AF_AF_AUTOFITTER_SERVICE_GET (GET_PIC(library)->af_autofitter_service) |
||||
|
||||
#endif /* FT_CONFIG_OPTION_PIC */ |
||||
|
||||
/* */ |
||||
|
||||
FT_END_HEADER |
||||
|
||||
#endif /* __AFPIC_H__ */ |
||||
|
||||
|
||||
/* END */ |
||||
Loading…
Reference in new issue