diff options
| author | Moazin Khatti <moazinkhatri@gmail.com> | 2019-07-10 13:58:59 +0500 |
|---|---|---|
| committer | Moazin Khatti <moazinkhatri@gmail.com> | 2019-08-17 20:36:05 +0500 |
| commit | fbdd9f9ba38736537d3daf53abcdbb03704fb5d0 (patch) | |
| tree | b287d6dc6f2af835b0711a8a8e86b4436a51715a /src | |
| parent | cf44c0cbddfdc770e5f5192fd89ee026d7eed834 (diff) | |
| download | freetype2-fbdd9f9ba38736537d3daf53abcdbb03704fb5d0.tar.gz | |
Memory allocation for `state' of renderer should be performed
on the SVG port side not the FT size. Minor doc fixes.
Diffstat (limited to 'src')
| -rw-r--r-- | src/base/ftobjs.c | 2 | ||||
| -rw-r--r-- | src/svg/ftsvg.c | 10 | ||||
| -rw-r--r-- | src/svg/svgtypes.c | 1 |
3 files changed, 1 insertions, 12 deletions
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 770b29027..aec7cc5b4 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -5596,7 +5596,6 @@ SVG_Lib_Init init_hook, SVG_Lib_Free free_hook, SVG_Lib_Render render_hook, - SVG_Lib_Get_State_Size get_state_size, SVG_Lib_Get_Buffer_Size get_buffer_size ) { FT_Module renderer; @@ -5614,7 +5613,6 @@ init_hook, free_hook, render_hook, - get_state_size, get_buffer_size ); return FT_Err_Ok; } diff --git a/src/svg/ftsvg.c b/src/svg/ftsvg.c index bf027c52f..59057d2bd 100644 --- a/src/svg/ftsvg.c +++ b/src/svg/ftsvg.c @@ -36,10 +36,8 @@ ft_svg_done( SVG_Renderer svg_module ) { FT_Library library = svg_module->root.root.library; - FT_Memory memory = library->memory; if ( svg_module->loaded == TRUE ) svg_module->hooks.svg_lib_free( library ); - FT_FREE( library->svg_renderer_state ); svg_module->loaded = FALSE; } @@ -54,17 +52,13 @@ FT_Memory memory = library->memory; FT_BBox outline_bbox; FT_Error error; + FT_ULong size_image_buffer; SVG_RendererHooks hooks = svg_renderer->hooks; - unsigned long size_image_buffer; if ( svg_renderer->loaded == FALSE ) { - FT_MEM_ALLOC( library->svg_renderer_state, - hooks.svg_lib_get_state_size() ); - if ( error ) - return error; error = hooks.svg_lib_init( library ); svg_renderer->loaded = TRUE; } @@ -88,7 +82,6 @@ SVG_Lib_Init init_hook, SVG_Lib_Free free_hook, SVG_Lib_Render render_hook, - SVG_Lib_Get_State_Size get_state_size, SVG_Lib_Get_Buffer_Size get_buffer_size ) { SVG_Renderer renderer; @@ -98,7 +91,6 @@ renderer->hooks.svg_lib_free = free_hook; renderer->hooks.svg_lib_render = render_hook; - renderer->hooks.svg_lib_get_state_size = get_state_size; renderer->hooks.svg_lib_get_buffer_size = get_buffer_size; return FT_Err_Ok; diff --git a/src/svg/svgtypes.c b/src/svg/svgtypes.c index d3938581d..dbbd7f8d2 100644 --- a/src/svg/svgtypes.c +++ b/src/svg/svgtypes.c @@ -28,7 +28,6 @@ SVG_Lib_Free svg_lib_free; SVG_Lib_Render svg_lib_render; - SVG_Lib_Get_State_Size svg_lib_get_state_size; SVG_Lib_Get_Buffer_Size svg_lib_get_buffer_size; } SVG_RendererHooks; |