diff --git a/include/freetype/svgrenderer.h b/include/freetype/svgrenderer.h index 1213d3329..1ab23aa02 100644 --- a/include/freetype/svgrenderer.h +++ b/include/freetype/svgrenderer.h @@ -43,7 +43,7 @@ FT_BEGIN_HEADER */ typedef FT_Error - (*SVG_Lib_Init)( ); + (*SVG_Lib_Init)( ); /************************************************************************** @@ -73,7 +73,7 @@ FT_BEGIN_HEADER * * @input: * svg_doc:: - * A pointer to the svg document + * A pointer to the svg document * * @return: * FreeType error code. 0 means success. @@ -94,7 +94,7 @@ FT_BEGIN_HEADER * * @input: * module:: - * FT_Module instance. + * FT_Module instance. * * init_hook:: * A function pointer of the type `SVG_Lib_Init'. Read the documentation @@ -105,7 +105,7 @@ FT_BEGIN_HEADER * of `SVG_Lib_Free'. * * render_hook:: - * A function pointer of the type `SVG_Lib_Render'. Read the + * A function pointer of the type `SVG_Lib_Render'. Read the * documentation of `SVG_Lib_Render'. * * @return: @@ -114,7 +114,7 @@ FT_BEGIN_HEADER typedef FT_Error (*SVG_Set_Hooks)( FT_Module module, - SVG_Lib_Init init_hook, + SVG_Lib_Init init_hook, SVG_Lib_Free free_hook, SVG_Lib_Render render_hook ); @@ -124,7 +124,7 @@ FT_BEGIN_HEADER * SVG_Renderer_Interface * * @description: - * An interface structure that function needed to inject external SVG + * An interface structure that function needed to inject external SVG * rendering library hooks. * * @fields: @@ -135,16 +135,16 @@ FT_BEGIN_HEADER * FreeType error code. 0 means success. */ - typedef struct SVG_Renderer_Interface_ + typedef struct SVG_Renderer_Interface_ { - SVG_Set_Hooks set_hooks; + SVG_Set_Hooks set_hooks; } SVG_Renderer_Interface; /* TODO: to document */ FT_Error - FT_Set_Svg_Hooks( FT_Library library, - SVG_Lib_Init init_hook, + FT_Set_Svg_Hooks( FT_Library library, + SVG_Lib_Init init_hook, SVG_Lib_Free free_hook, SVG_Lib_Render render_hook ); diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c index 02e01780f..aa0962873 100644 --- a/src/base/ftobjs.c +++ b/src/base/ftobjs.c @@ -5551,14 +5551,14 @@ } FT_EXPORT_DEF( FT_Error ) - FT_Set_Svg_Hooks( FT_Library library, - SVG_Lib_Init init_hook, + FT_Set_Svg_Hooks( FT_Library library, + SVG_Lib_Init init_hook, SVG_Lib_Free free_hook, SVG_Lib_Render render_hook ) { FT_Module renderer; SVG_Renderer_Interface *svg; - + renderer = FT_Get_Module( library, "ot-svg" ); svg = (SVG_Renderer_Interface*)renderer->clazz->module_interface; svg->set_hooks(renderer, init_hook, free_hook, render_hook); diff --git a/src/sfnt/ttsvg.c b/src/sfnt/ttsvg.c index e076ee1e8..fa2ce5871 100644 --- a/src/sfnt/ttsvg.c +++ b/src/sfnt/ttsvg.c @@ -210,7 +210,7 @@ (FT_ULong)doc_list[doc_length - 2] << 16 | (FT_ULong)doc_list[doc_length - 3] << 8 | (FT_ULong)doc_list[doc_length - 4]; - + /* TODO: (OT-SVG) memory allocated here needs to be freed somewhere */ uncomp_buffer = (FT_Byte*) memory->alloc(memory, uncomp_size); error = FT_Gzip_Uncompress( memory, uncomp_buffer, &uncomp_size, diff --git a/src/svg/ftsvg.c b/src/svg/ftsvg.c index 4eba6dfaa..901c576c1 100644 --- a/src/svg/ftsvg.c +++ b/src/svg/ftsvg.c @@ -23,7 +23,7 @@ #include "ftsvg.h" /* tmp hook injection */ - FT_Error + FT_Error tmp_svg_lib_init() { FT_Error error; @@ -39,7 +39,7 @@ { FT_Error error = FT_Err_Ok; svg_module->loaded = FALSE; - return error; + return error; } static FT_Error @@ -61,7 +61,7 @@ static FT_Error ft_svg_set_hooks( FT_Module renderer_, - SVG_Lib_Init init_hook, + SVG_Lib_Init init_hook, SVG_Lib_Free free_hook, SVG_Lib_Render render_hook ) { @@ -76,7 +76,7 @@ } - static const SVG_Renderer_Interface svg_renderer_interface = + static const SVG_Renderer_Interface svg_renderer_interface = { (SVG_Set_Hooks)ft_svg_set_hooks }; diff --git a/src/svg/svgtypes.c b/src/svg/svgtypes.c index 889d96458..5c86469e0 100644 --- a/src/svg/svgtypes.c +++ b/src/svg/svgtypes.c @@ -23,7 +23,7 @@ typedef struct SVG_RendererHooks_ { - /* Api Hooks for OT-SVG Rendering */ + /* Api Hooks for OT-SVG Rendering */ SVG_Lib_Init svg_lib_init; SVG_Lib_Free svg_lib_free; SVG_Lib_Render svg_lib_render;