[freetype2-demos] wl/conditional-svg 7afaf74: Use FT_CONFIG_OPTION_SVG.

[Werner Lemberg]

branch: wl/conditional-svg
commit 7afaf742b35f2727ea16baf1531264fc57c047c9
Author: Werner Lemberg <wl@gnu.org>
Commit: Werner Lemberg <wl@gnu.org>

    Use FT_CONFIG_OPTION_SVG.
    
    * src/ftcommon.c, src/rsvg-port.c: Guard SVG code with
    `FT_CONFIG_OPTION_SVG`.
---
 src/ftcommon.c  | 16 +++++++++++++---
 src/rsvg-port.c |  9 +++++++++
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/ftcommon.c b/src/ftcommon.c
index 725ddb5..83aa61f 100644
--- a/src/ftcommon.c
+++ b/src/ftcommon.c
@@ -27,7 +27,6 @@
 
 #include FT_BITMAP_H
 #include FT_FONT_FORMATS_H
-#include FT_OTSVG_H
 
 
   /* error messages */
@@ -39,7 +38,11 @@
 #include "common.h"
 #include "strbuf.h"
 #include "ftcommon.h"
+
+#ifdef FT_CONFIG_OPTION_USE_SVG
+#include FT_OTSVG_H
 #include "rsvg-port.h"
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -340,11 +343,13 @@
   {
     FTDemo_Handle*  handle;
 
+#ifdef FT_CONFIG_OPTION_SVG
     SVG_RendererHooks  hooks = {
                          (SVG_Lib_Init_Func)rsvg_port_init,
                          (SVG_Lib_Free_Func)rsvg_port_free,
                          (SVG_Lib_Render_Func)rsvg_port_render,
                          (SVG_Lib_Preset_Slot_Func)rsvg_port_preset_slot };
+#endif
 
 
     handle = (FTDemo_Handle *)malloc( sizeof ( FTDemo_Handle ) );
@@ -357,8 +362,10 @@
     if ( error )
       PanicZ( "could not initialize FreeType" );
 
+#ifdef FT_CONFIG_OPTION_SVG
     /* XXX error handling? */
     FT_Property_Set( handle->library, "ot-svg", "svg_hooks", &hooks );
+#endif
 
     error = FTC_Manager_New( handle->library, 0, 0, 0,
                              my_face_requester, 0, &handle->cache_manager );
@@ -1345,8 +1352,11 @@
 
     error = FT_Err_Ok;
 
-    if ( glyf->format == FT_GLYPH_FORMAT_OUTLINE ||
-         glyf->format == FT_GLYPH_FORMAT_SVG     )
+    if ( glyf->format == FT_GLYPH_FORMAT_OUTLINE
+#ifdef FT_CONFIG_OPTION_SVG
+         || glyf->format == FT_GLYPH_FORMAT_SVG
+#endif
+       )
     {
       FT_Render_Mode  render_mode;
 
diff --git a/src/rsvg-port.c b/src/rsvg-port.c
index 1216630..d1c0c39 100644
--- a/src/rsvg-port.c
+++ b/src/rsvg-port.c
@@ -16,6 +16,8 @@
  *
  */
 
+#ifdef FT_CONFIG_OPTION_SVG
+
 #include <cairo.h>
 #include <librsvg/rsvg.h>
 #include <stdlib.h>
@@ -396,5 +398,12 @@
     return error;
   }
 
+#else /* !FT_CONFIG_OPTION_SVG */
+
+  /* ANSI C doesn't like empty source files */
+  typedef int  _rsvg_port_dummy;
+
+#endif /* !FT_CONFIG_OPTION_SVG */
+
 
 /* End */