[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] GSoC-2019-moazin 45be904 10/18: [ot-svg] Silly mistake fix.
From: |
Moazin Khatti |
Subject: |
[freetype2] GSoC-2019-moazin 45be904 10/18: [ot-svg] Silly mistake fix. |
Date: |
Sun, 23 Jun 2019 02:32:13 -0400 (EDT) |
branch: GSoC-2019-moazin
commit 45be90478a4e259586c2d2a63d1b5fb509229ad0
Author: Moazin Khatti <address@hidden>
Commit: Moazin Khatti <address@hidden>
[ot-svg] Silly mistake fix.
Instead of an `FT_Library' instance, `FT_Module' is supposed
to be passed.
---
include/freetype/svgrenderer.h | 6 +++---
src/base/ftobjs.c | 4 ++--
src/svg/ftsvg.c | 11 ++++-------
3 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/include/freetype/svgrenderer.h b/include/freetype/svgrenderer.h
index e74e245..1213d33 100644
--- a/include/freetype/svgrenderer.h
+++ b/include/freetype/svgrenderer.h
@@ -93,8 +93,8 @@ FT_BEGIN_HEADER
* Interface.
*
* @input:
- * library::
- * FT_Library instance.
+ * module::
+ * FT_Module instance.
*
* init_hook::
* A function pointer of the type `SVG_Lib_Init'. Read the documentation
@@ -113,7 +113,7 @@ FT_BEGIN_HEADER
*/
typedef FT_Error
- (*SVG_Set_Hooks)( FT_Library library,
+ (*SVG_Set_Hooks)( FT_Module module,
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 09c97ab..02e0178 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -4541,7 +4541,7 @@
break;
case FT_GLYPH_FORMAT_SVG: /* handle svg rendering */
renderer = FT_Lookup_Renderer( library, slot->format, NULL );
-
+ error = renderer->clazz->render_glyph( renderer, slot,
FT_RENDER_MODE_NORMAL, NULL);
break;
default:
if ( slot->internal->load_flags & FT_LOAD_COLOR )
@@ -5561,7 +5561,7 @@
renderer = FT_Get_Module( library, "ot-svg" );
svg = (SVG_Renderer_Interface*)renderer->clazz->module_interface;
- svg->set_hooks(library, init_hook, free_hook, render_hook);
+ svg->set_hooks(renderer, init_hook, free_hook, render_hook);
return FT_Err_Ok;
}
diff --git a/src/svg/ftsvg.c b/src/svg/ftsvg.c
index 1b92259..4eba6df 100644
--- a/src/svg/ftsvg.c
+++ b/src/svg/ftsvg.c
@@ -38,12 +38,7 @@
ft_svg_init( SVG_Renderer svg_module )
{
FT_Error error = FT_Err_Ok;
- SVG_RendererHooks hooks;
-
- hooks.svg_lib_init = tmp_svg_lib_init;
- svg_module->hooks = hooks;
svg_module->loaded = FALSE;
-
return error;
}
@@ -56,10 +51,12 @@
SVG_Renderer renderer_ = (SVG_Renderer)renderer;
if( renderer_->loaded == FALSE )
+ {
renderer_->loaded = TRUE;
+ renderer_->hooks.svg_lib_init();
+ }
- renderer_->hooks.svg_lib_init();
- return FT_Err_Ok;
+ return renderer_->hooks.svg_lib_render( slot );
}
static FT_Error
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] GSoC-2019-moazin 45be904 10/18: [ot-svg] Silly mistake fix.,
Moazin Khatti <=