rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Instead of individual properties. Just use one that 

takes pointer to the hooks structure.
This commit is contained in:
Moazin Khatti 2019-07-18 00:05:49 +05:00
parent 1541091e76
commit d86de4e9d4
3 changed files with 18 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/freetype/svgrender.h
View File

@ -121,6 +121,16 @@ FT_BEGIN_HEADER
(*SVG_Lib_Get_Buffer_Size_Func)( FT_GlyphSlot slot,
FT_BBox bbox );
typedef struct SVG_RendererHooks_
{
/* Api Hooks for OT-SVG Rendering */
SVG_Lib_Init_Func init_svg;
SVG_Lib_Free_Func free_svg;
SVG_Lib_Render_Func render_svg;
SVG_Lib_Get_Buffer_Size_Func get_buffer_size;
} SVG_RendererHooks;
/**************************************************************************
*
* @struct:

35
src/svg/ftsvg.c
View File

@ -88,14 +88,11 @@
FT_Error error = FT_Err_Ok;
SVG_Renderer renderer = (SVG_Renderer)module;
if ( !ft_strcmp( property_name, "init_svg_hook" ) )
renderer->hooks.init_svg = (SVG_Lib_Init_Func)value;
else if ( !ft_strcmp( property_name, "free_svg_hook" ) )
renderer->hooks.free_svg = (SVG_Lib_Free_Func)value;
else if ( !ft_strcmp( property_name, "render_svg_hook" ) )
renderer->hooks.render_svg = (SVG_Lib_Render_Func)value;
else if ( !ft_strcmp( property_name, "get_buffer_size_hook" ) )
renderer->hooks.get_buffer_size = (SVG_Lib_Get_Buffer_Size_Func)value;
if ( !ft_strcmp( property_name, "svg_hooks" ) )
{
SVG_RendererHooks* hooks = (SVG_RendererHooks*)value;
renderer->hooks = *hooks;
}
else
{
error = FT_THROW( Missing_Property );
@ -111,26 +108,10 @@
FT_Error error = FT_Err_Ok;
SVG_Renderer renderer = (SVG_Renderer)module;
if ( !ft_strcmp( property_name, "init_svg_hook" ) )
if ( !ft_strcmp( property_name, "svg_hooks" ) )
{
SVG_Lib_Init_Func* val = (SVG_Lib_Init_Func*)value;
*val = (SVG_Lib_Init_Func)renderer->hooks.init_svg;
}
else if ( !ft_strcmp( property_name, "free_svg_hook" ) )
{
SVG_Lib_Free_Func* val = (SVG_Lib_Free_Func*)value;
*val = (SVG_Lib_Free_Func)renderer->hooks.free_svg;
}
else if ( !ft_strcmp( property_name, "render_svg_hook" ) )
{
SVG_Lib_Render_Func* val = (SVG_Lib_Render_Func*)value;
*val = (SVG_Lib_Render_Func)renderer->hooks.render_svg;
}
else if ( !ft_strcmp( property_name, "get_buffer_size_hook" ) )
{
SVG_Lib_Get_Buffer_Size_Func* val;
val = (SVG_Lib_Get_Buffer_Size_Func*)value;
*val = (SVG_Lib_Get_Buffer_Size_Func)renderer->hooks.render_svg;
SVG_RendererHooks* hooks = (SVG_RendererHooks*)value;
*hooks = renderer->hooks;
}
else
{

10
src/svg/svgtypes.c
View File

@ -21,16 +21,6 @@
#include FT_RENDER_H
#include FT_SVG_RENDER_H
typedef struct SVG_RendererHooks_
{
/* Api Hooks for OT-SVG Rendering */
SVG_Lib_Init_Func init_svg;
SVG_Lib_Free_Func free_svg;
SVG_Lib_Render_Func render_svg;
SVG_Lib_Get_Buffer_Size_Func get_buffer_size;
} SVG_RendererHooks;
typedef struct SVG_RendererRec_
{
FT_RendererRec root; /* This inherits FT_RendererRec */