* src/raster/ftrend1.h declare ft_raster1_renderer_class and ft_raster5_renderer_class using macros from ftrender.h, when FT_CONFIG_OPTION_PIC is defined create and destroy functions will be declared. * src/smooth/ftrend1.c when FT_CONFIG_OPTION_PIC is defined ft_raster1_renderer_class and ft_raster5_renderer_class structs will have functions to init or create and destroy them instead of being allocated in the global scope. Macros will be used from rastpic.h in order to access ft_standard_raster from the pic_container (allocated in ftraster.c). In ft_raster1_render when PIC is enabled, the last letter of module_name is used to verfy the renderer class rather than the class pointer. * src/raster/ftraster.c when FT_CONFIG_OPTION_PIC is defined ft_standard_raster struct will have function to init it instead of being allocated in the global scope. New Files: * src/raster/rastpic.h declare struct to hold PIC globals for raster renderer and macros to access them. * src/raster/rastpic.c implement functions to allocate, destroy and initialize PIC globals for raster renderer. * src/raster/raster.c add new file to build: rastpic.c. * src/raster/jamfile add new files to FT2_MULTI build: rastpic.c.david-pic-changes
Oran Agra
16 years ago
parent
c1e22f3986
commit
056095096f
8 changed files with 210 additions and 20 deletions
@ -0,0 +1,89 @@ |
||||
/***************************************************************************/ |
||||
/* */ |
||||
/* rastpic.c */ |
||||
/* */ |
||||
/* The FreeType position independent code services for raster 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 "rastpic.h" |
||||
|
||||
#ifdef FT_CONFIG_OPTION_PIC |
||||
|
||||
/* forward declaration of PIC init functions from ftraster.c */ |
||||
void FT_Init_Class_ft_standard_raster(FT_Raster_Funcs*); |
||||
|
||||
void |
||||
ft_raster1_renderer_class_pic_free( FT_Library library ) |
||||
{ |
||||
FT_PIC_Container* pic_container = &library->pic_container; |
||||
FT_Memory memory = library->memory; |
||||
if ( pic_container->raster ) |
||||
{ |
||||
RasterPIC* container = (RasterPIC*)pic_container->raster; |
||||
if(--container->ref_count) |
||||
return; |
||||
FT_FREE( container ); |
||||
pic_container->raster = NULL; |
||||
} |
||||
} |
||||
|
||||
|
||||
FT_Error |
||||
ft_raster1_renderer_class_pic_init( FT_Library library ) |
||||
{ |
||||
FT_PIC_Container* pic_container = &library->pic_container; |
||||
FT_Error error = FT_Err_Ok; |
||||
RasterPIC* container; |
||||
FT_Memory memory = library->memory; |
||||
|
||||
/* since this function also serve raster5 renderer,
|
||||
it implements reference counting */ |
||||
if(pic_container->raster) |
||||
{ |
||||
((RasterPIC*)pic_container->raster)->ref_count++; |
||||
return error; |
||||
} |
||||
|
||||
/* 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->raster = container; |
||||
container->ref_count = 1; |
||||
|
||||
/* initialize pointer table - this is how the module usually expects this data */ |
||||
FT_Init_Class_ft_standard_raster(&container->ft_standard_raster); |
||||
/*Exit:*/ |
||||
if(error) |
||||
ft_raster1_renderer_class_pic_free(library); |
||||
return error; |
||||
} |
||||
|
||||
/* re-route these init and free functions to the above functions */ |
||||
FT_Error ft_raster5_renderer_class_pic_init(FT_Library library) |
||||
{ |
||||
return ft_raster1_renderer_class_pic_init(library); |
||||
} |
||||
void ft_raster5_renderer_class_pic_free(FT_Library library) |
||||
{ |
||||
ft_raster1_renderer_class_pic_free(library); |
||||
} |
||||
|
||||
#endif /* FT_CONFIG_OPTION_PIC */ |
||||
|
||||
|
||||
/* END */ |
||||
@ -0,0 +1,50 @@ |
||||
/***************************************************************************/ |
||||
/* */ |
||||
/* rastpic.h */ |
||||
/* */ |
||||
/* The FreeType position independent code services for raster 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 __RASTPIC_H__ |
||||
#define __RASTPIC_H__ |
||||
|
||||
|
||||
FT_BEGIN_HEADER |
||||
|
||||
#include FT_INTERNAL_PIC_H |
||||
|
||||
#ifndef FT_CONFIG_OPTION_PIC |
||||
#define FT_STANDARD_RASTER_GET ft_standard_raster |
||||
|
||||
#else /* FT_CONFIG_OPTION_PIC */ |
||||
|
||||
typedef struct RasterPIC_ |
||||
{ |
||||
int ref_count; |
||||
FT_Raster_Funcs ft_standard_raster; |
||||
} RasterPIC; |
||||
|
||||
#define GET_PIC(lib) ((RasterPIC*)((lib)->pic_container.raster)) |
||||
#define FT_STANDARD_RASTER_GET (GET_PIC(library)->ft_standard_raster) |
||||
|
||||
#endif /* FT_CONFIG_OPTION_PIC */ |
||||
|
||||
/* */ |
||||
|
||||
FT_END_HEADER |
||||
|
||||
#endif /* __RASTPIC_H__ */ |
||||
|
||||
|
||||
/* END */ |
||||
Loading…
Reference in new issue