Remove remnants of raster pool.
* include/freetype/internal/ftobjs.h (FT_LibraryRec): Remove `raster_pool' and `raster_pool_size' fields. * src/base/ftobjs.c (FT_New_Library), src/raster/ftrend1.c (ft_raster1_init), src/smooth/ftsmooth.c (ft_smooth_init): Updated.
This commit is contained in:
parent
a12a34451a
commit
e99b26aada
10
ChangeLog
10
ChangeLog
|
@ -1,3 +1,13 @@
|
||||||
|
2017-05-14 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
Remove remnants of raster pool.
|
||||||
|
|
||||||
|
* include/freetype/internal/ftobjs.h (FT_LibraryRec): Remove
|
||||||
|
`raster_pool' and `raster_pool_size' fields.
|
||||||
|
|
||||||
|
* src/base/ftobjs.c (FT_New_Library), src/raster/ftrend1.c
|
||||||
|
(ft_raster1_init), src/smooth/ftsmooth.c (ft_smooth_init): Updated.
|
||||||
|
|
||||||
2017-05-13 Werner Lemberg <wl@gnu.org>
|
2017-05-13 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
* Version 2.8 released.
|
* Version 2.8 released.
|
||||||
|
|
|
@ -1064,24 +1064,24 @@ FT_BEGIN_HEADER
|
||||||
/* */
|
/* */
|
||||||
/* <Description> */
|
/* <Description> */
|
||||||
/* FreeType used to provide an area of memory called the `render */
|
/* FreeType used to provide an area of memory called the `render */
|
||||||
/* pool' available to all registered rasters. This was not thread */
|
/* pool' available to all registered rasterizers. This was not */
|
||||||
/* safe however and now FreeType never allocates this pool. NULL */
|
/* thread safe, however, and now FreeType never allocates this pool. */
|
||||||
/* is always passed in as pool_base. */
|
|
||||||
/* */
|
/* */
|
||||||
/* This function is called each time the render pool changes, or just */
|
/* This function is called after a new raster object is created. */
|
||||||
/* after a new raster object is created. */
|
|
||||||
/* */
|
/* */
|
||||||
/* <Input> */
|
/* <Input> */
|
||||||
/* raster :: A handle to the new raster object. */
|
/* raster :: A handle to the new raster object. */
|
||||||
/* */
|
/* */
|
||||||
/* pool_base :: The address in memory of the render pool. */
|
/* pool_base :: Previously, the address in memory of the render pool. */
|
||||||
|
/* Set this to NULL. */
|
||||||
/* */
|
/* */
|
||||||
/* pool_size :: The size in bytes of the render pool. */
|
/* pool_size :: Previously, the size in bytes of the render pool. */
|
||||||
|
/* Set this to 0. */
|
||||||
/* */
|
/* */
|
||||||
/* <Note> */
|
/* <Note> */
|
||||||
/* Rasters should ignore the render pool and rely on dynamic or stack */
|
/* Rasterizers should rely on dynamic or stack allocation if they */
|
||||||
/* allocation if they want to (a handle to the memory allocator is */
|
/* want to (a handle to the memory allocator is passed to the */
|
||||||
/* passed to the raster constructor). */
|
/* rasterizer constructor). */
|
||||||
/* */
|
/* */
|
||||||
typedef void
|
typedef void
|
||||||
(*FT_Raster_ResetFunc)( FT_Raster raster,
|
(*FT_Raster_ResetFunc)( FT_Raster raster,
|
||||||
|
|
|
@ -856,11 +856,6 @@ FT_BEGIN_HEADER
|
||||||
/* */
|
/* */
|
||||||
/* auto_hinter :: The auto-hinter module interface. */
|
/* auto_hinter :: The auto-hinter module interface. */
|
||||||
/* */
|
/* */
|
||||||
/* raster_pool :: The raster object's render pool. This can */
|
|
||||||
/* ideally be changed dynamically at run-time. */
|
|
||||||
/* */
|
|
||||||
/* raster_pool_size :: The size of the render pool in bytes. */
|
|
||||||
/* */
|
|
||||||
/* debug_hooks :: An array of four function pointers that allow */
|
/* debug_hooks :: An array of four function pointers that allow */
|
||||||
/* debuggers to hook into a font format's */
|
/* debuggers to hook into a font format's */
|
||||||
/* interpreter. Currently, only the TrueType */
|
/* interpreter. Currently, only the TrueType */
|
||||||
|
@ -903,10 +898,6 @@ FT_BEGIN_HEADER
|
||||||
FT_Renderer cur_renderer; /* current outline renderer */
|
FT_Renderer cur_renderer; /* current outline renderer */
|
||||||
FT_Module auto_hinter;
|
FT_Module auto_hinter;
|
||||||
|
|
||||||
FT_Byte* raster_pool; /* scan-line conversion */
|
|
||||||
/* render pool */
|
|
||||||
FT_ULong raster_pool_size; /* size of render pool in bytes */
|
|
||||||
|
|
||||||
FT_DebugHook_Func debug_hooks[4];
|
FT_DebugHook_Func debug_hooks[4];
|
||||||
|
|
||||||
#ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
|
#ifdef FT_CONFIG_OPTION_SUBPIXEL_RENDERING
|
||||||
|
|
|
@ -4973,10 +4973,6 @@
|
||||||
goto Fail;
|
goto Fail;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* we don't use raster_pool anymore. */
|
|
||||||
library->raster_pool_size = 0;
|
|
||||||
library->raster_pool = NULL;
|
|
||||||
|
|
||||||
library->version_major = FREETYPE_MAJOR;
|
library->version_major = FREETYPE_MAJOR;
|
||||||
library->version_minor = FREETYPE_MINOR;
|
library->version_minor = FREETYPE_MINOR;
|
||||||
library->version_patch = FREETYPE_PATCH;
|
library->version_patch = FREETYPE_PATCH;
|
||||||
|
|
|
@ -31,12 +31,7 @@
|
||||||
static FT_Error
|
static FT_Error
|
||||||
ft_raster1_init( FT_Renderer render )
|
ft_raster1_init( FT_Renderer render )
|
||||||
{
|
{
|
||||||
FT_Library library = FT_MODULE_LIBRARY( render );
|
render->clazz->raster_class->raster_reset( render->raster, NULL, 0 );
|
||||||
|
|
||||||
|
|
||||||
render->clazz->raster_class->raster_reset( render->raster,
|
|
||||||
library->raster_pool,
|
|
||||||
library->raster_pool_size );
|
|
||||||
|
|
||||||
return FT_Err_Ok;
|
return FT_Err_Ok;
|
||||||
}
|
}
|
||||||
|
|
|
@ -31,12 +31,7 @@
|
||||||
static FT_Error
|
static FT_Error
|
||||||
ft_smooth_init( FT_Renderer render )
|
ft_smooth_init( FT_Renderer render )
|
||||||
{
|
{
|
||||||
FT_Library library = FT_MODULE_LIBRARY( render );
|
render->clazz->raster_class->raster_reset( render->raster, NULL, 0 );
|
||||||
|
|
||||||
|
|
||||||
render->clazz->raster_class->raster_reset( render->raster,
|
|
||||||
library->raster_pool,
|
|
||||||
library->raster_pool_size );
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue