[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] GSoC-2019-moazin 02b14b7: Public interface should remain sam
From: |
Moazin Khatti |
Subject: |
[freetype2] GSoC-2019-moazin 02b14b7: Public interface should remain same whether |
Date: |
Wed, 17 Jul 2019 08:02:42 -0400 (EDT) |
branch: GSoC-2019-moazin
commit 02b14b782489d9e99f8393dab33074e794e24a3c
Author: Moazin Khatti <address@hidden>
Commit: Moazin Khatti <address@hidden>
Public interface should remain same whether
`FT_CONFIG_OPTION_SVG' is set or not.
---
include/freetype/freetype.h | 2 --
include/freetype/ftglyph.h | 2 --
include/freetype/internal/ftobjs.h | 2 --
include/freetype/internal/tttypes.h | 2 --
include/freetype/svgrender.h | 2 --
src/base/ftobjs.c | 15 +++++++++++++++
6 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/include/freetype/freetype.h b/include/freetype/freetype.h
index 4d1f474..d715f28 100644
--- a/include/freetype/freetype.h
+++ b/include/freetype/freetype.h
@@ -1227,9 +1227,7 @@ FT_BEGIN_HEADER
#define FT_FACE_FLAG_TRICKY ( 1L << 13 )
#define FT_FACE_FLAG_COLOR ( 1L << 14 )
#define FT_FACE_FLAG_VARIATION ( 1L << 15 )
-#ifdef FT_CONFIG_OPTION_SVG
#define FT_FACE_FLAG_SVG ( 1L << 16 )
-#endif
/**************************************************************************
diff --git a/include/freetype/ftglyph.h b/include/freetype/ftglyph.h
index b71c547..8b1e3f6 100644
--- a/include/freetype/ftglyph.h
+++ b/include/freetype/ftglyph.h
@@ -223,7 +223,6 @@ FT_BEGIN_HEADER
} FT_OutlineGlyphRec;
-#ifdef FT_CONFIG_OPTION_SVG
/**************************************************************************
*
* @type:
@@ -293,7 +292,6 @@ FT_BEGIN_HEADER
/* TODO: (OT-SVG) Maybe put a transformation matrix here */
} FT_SvgGlyphRec;
-#endif
/**************************************************************************
*
diff --git a/include/freetype/internal/ftobjs.h
b/include/freetype/internal/ftobjs.h
index 652349c..a89caa7 100644
--- a/include/freetype/internal/ftobjs.h
+++ b/include/freetype/internal/ftobjs.h
@@ -419,9 +419,7 @@ FT_BEGIN_HEADER
*/
#define FT_GLYPH_OWN_BITMAP 0x1U
-#ifdef FT_CONFIG_OPTION_SVG
#define FT_GLYPH_OWN_GZIP_SVG 0x2U
-#endif
typedef struct FT_Slot_InternalRec_
{
diff --git a/include/freetype/internal/tttypes.h
b/include/freetype/internal/tttypes.h
index c772d0c..42a921f 100644
--- a/include/freetype/internal/tttypes.h
+++ b/include/freetype/internal/tttypes.h
@@ -1645,10 +1645,8 @@ FT_BEGIN_HEADER
void* cpal;
void* colr;
-#ifdef FT_CONFIG_OPTION_SVG
/* OpenType SVG Glyph Support */
void* svg;
-#endif
} TT_FaceRec;
diff --git a/include/freetype/svgrender.h b/include/freetype/svgrender.h
index b2f14c3..181bfea 100644
--- a/include/freetype/svgrender.h
+++ b/include/freetype/svgrender.h
@@ -28,7 +28,6 @@
#error "so that freetype.h of FreeType 2 is found first."
#endif
-#ifdef FT_CONFIG_OPTION_SVG
FT_BEGIN_HEADER
/**************************************************************************
@@ -256,5 +255,4 @@ FT_BEGIN_HEADER
typedef struct FT_SVG_DocumentRec_* FT_SVG_Document;
FT_END_HEADER
-#endif /* FT_CONFIG_OPTION_SVG */
#endif
diff --git a/src/base/ftobjs.c b/src/base/ftobjs.c
index 88944fb..5bf065f 100644
--- a/src/base/ftobjs.c
+++ b/src/base/ftobjs.c
@@ -5629,6 +5629,21 @@
get_buffer_size );
return FT_Err_Ok;
}
+#else
+ FT_EXPORT_DEF( FT_Error )
+ FT_Set_Svg_Hooks( FT_Library library,
+ 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 )
+ {
+ FT_UNUSED( library );
+ FT_UNUSED( init_svg );
+ FT_UNUSED( free_svg );
+ FT_UNUSED( render_svg );
+ FT_UNUSED( get_buffer_size );
+ return FT_THROW( Unimplemented_Feature );
+ }
#endif
/* END */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] GSoC-2019-moazin 02b14b7: Public interface should remain same whether,
Moazin Khatti <=