freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] GSoC-2019-moazin 9fb8feb 42/47: Make `ft_svg_renderer_class'


From: Moazin Khatti
Subject: [freetype2] GSoC-2019-moazin 9fb8feb 42/47: Make `ft_svg_renderer_class' dumb if OT-SVG
Date: Fri, 26 Jul 2019 10:02:10 -0400 (EDT)

branch: GSoC-2019-moazin
commit 9fb8febde9e649b06d4ec7a1a79948150b6fef79
Author: Moazin Khatti <address@hidden>
Commit: Moazin Khatti <address@hidden>

    Make `ft_svg_renderer_class' dumb if OT-SVG
    support is disabled.
---
 src/svg/ftsvg.c | 21 +++++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/svg/ftsvg.c b/src/svg/ftsvg.c
index cca8d45..4c0146c 100644
--- a/src/svg/ftsvg.c
+++ b/src/svg/ftsvg.c
@@ -28,6 +28,7 @@
 
 #include "ftsvg.h"
 
+#ifdef FT_CONFIG_OPTION_SVG
   /* ft_svg_init */
   static FT_Error
   ft_svg_init( SVG_Renderer svg_module )
@@ -163,6 +164,14 @@
     return 0;
   }
 
+#endif
+
+#ifdef FT_CONFIG_OPTION_SVG
+#define PUT_SVG_MODULE( a )  a
+#else
+#define PUT_SVG_MODULE( a )  NULL
+#endif
+
   FT_DEFINE_RENDERER(
     ft_svg_renderer_class,
 
@@ -173,11 +182,15 @@
       0x10000L,
       0x20000L,
       NULL,                                /* module specific interface */
-      (FT_Module_Constructor)ft_svg_init,  /* module_init */
-      (FT_Module_Destructor)ft_svg_done,   /* module_done */
-      ft_svg_get_interface,                /* get_interface */
+      (FT_Module_Constructor)PUT_SVG_MODULE( ft_svg_init ),  /* module_init */
+      (FT_Module_Destructor)PUT_SVG_MODULE( ft_svg_done ),   /* module_done */
+      PUT_SVG_MODULE( ft_svg_get_interface ),                /* get_interface 
*/
+#ifdef FT_CONFIG_OPTION_SVG
       FT_GLYPH_FORMAT_SVG,
-      (FT_Renderer_RenderFunc)ft_svg_render,
+#else
+      FT_GLYPH_FORMAT_NONE,
+#endif
+      (FT_Renderer_RenderFunc)PUT_SVG_MODULE( ft_svg_render ),
       NULL,
       NULL,
       NULL,



reply via email to

[Prev in Thread] Current Thread [Next in Thread]