minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 9 Releases Wiki Activity

Fix C++ compilation (#45762). 

* src/base/ftstroke.c (ft_outline_glyph_class): Use
FT_CALLBACK_TABLE.
This commit is contained in:
pazer 2015-08-15 06:53:09 +02:00 committed by Werner Lemberg
parent ae258aa088
commit f0ed30e6e6
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2015-08-15 pazer <ibemad@gmail.com>
Fix C++ compilation (#45762).
* src/base/ftstroke.c (ft_outline_glyph_class): Use
FT_CALLBACK_TABLE.
2015-08-14 Alexei Podtelezhnikov <apodtele@gmail.com>
[truetype] Clean up.

19
src/base/ftstroke.c
View File

@ -24,6 +24,16 @@
#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 */
@ -2285,15 +2295,6 @@
}
/* 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 */
FT_EXPORT_DEF( FT_Error )