ref: f0ed30e6e6979f92ffa68e9791cba3ad0f57c162
parent: ae258aa088e471f064cc8f540d2a6285eaaf29b5
author: pazer <[email protected]>
date: Sat Aug 15 02:53:09 EDT 2015
Fix C++ compilation (#45762). * src/base/ftstroke.c (ft_outline_glyph_class): Use FT_CALLBACK_TABLE.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2015-08-15 pazer <[email protected]>
+
+ Fix C++ compilation (#45762).
+
+ * src/base/ftstroke.c (ft_outline_glyph_class): Use
+ FT_CALLBACK_TABLE.
+
2015-08-14 Alexei Podtelezhnikov <[email protected]>
[truetype] Clean up.
--- a/src/base/ftstroke.c
+++ b/src/base/ftstroke.c
@@ -24,7 +24,17 @@
#include FT_INTERNAL_DEBUG_H
#include FT_INTERNAL_OBJECTS_H
+#include "basepic.h"
+
+ /* declare an extern to access `ft_outline_glyph_class' globally */
+ /* allocated in `ftglyph.c', and use the FT_OUTLINE_GLYPH_CLASS_GET */
+ /* macro to access it when FT_CONFIG_OPTION_PIC is defined */
+#ifndef FT_CONFIG_OPTION_PIC
+ FT_CALLBACK_TABLE const FT_Glyph_Class ft_outline_glyph_class;
+#endif
+
+
/* documentation is in ftstroke.h */
FT_EXPORT_DEF( FT_StrokerBorder )
@@ -2283,15 +2293,6 @@
Invalid_Outline:
return FT_THROW( Invalid_Outline );
}
-
-
- /* declare an extern to access `ft_outline_glyph_class' globally */
- /* allocated in `ftglyph.c', and use the FT_OUTLINE_GLYPH_CLASS_GET */
- /* macro to access it when FT_CONFIG_OPTION_PIC is defined */
-#ifndef FT_CONFIG_OPTION_PIC
- extern const FT_Glyph_Class ft_outline_glyph_class;
-#endif
-#include "basepic.h"
/* documentation is in ftstroke.h */