rgraves
/
freetype2
forked from minhngoc25a/freetype2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FT_USE_MODULE declares things as: 

extern const FT_Module_Class

(or similar for C++).  However, the actual types of the variables
being declared are often different, e.g., FT_Driver_ClassRec or
FT_Renderer_Class.  (Some are, indeed, FT_Module_Class.)

This works with most C compilers (since those structs begin with an
FT_Module_Class struct), but technically it's undefined behavior.

To quote the ISO/IEC 9899:TC2 final committee draft, section 6.2.7
paragraph 2:

  All declarations that refer to the same object or function shall
  have compatible type; otherwise, the behavior is undefined.

(And they are not compatible types.)

Most C compilers don't reject (or even detect!) code which has this
issue, but the GCC LTO development branch compiler does.  (It
outputs the types of the objects while generating .o files, along
with a bunch of other information, then compares them when doing the
final link-time code generation pass.)

Patch from Savannah bug #25133.

* src/base/ftinit.c (FT_USE_MODULE): Include variable type.

* builds/amiga/include/freetype/config/ftmodule.h,
include/freetype/config/ftmodule.h, */module.mk: Updated to declare
pass correct types to FT_USE_MODULE.
This commit is contained in:
Werner Lemberg 2008-12-21 10:29:30 +00:00
parent b6fa845146
commit ce33a312da
22 changed files with 98 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ChangeLog
View File

@ -1,8 +1,44 @@
2008-12-21 anonymous
FT_USE_MODULE declares things as:
extern const FT_Module_Class
(or similar for C++). However, the actual types of the variables
being declared are often different, e.g., FT_Driver_ClassRec or
FT_Renderer_Class. (Some are, indeed, FT_Module_Class.)
This works with most C compilers (since those structs begin with an
FT_Module_Class struct), but technically it's undefined behavior.
To quote the ISO/IEC 9899:TC2 final committee draft, section 6.2.7
paragraph 2:
All declarations that refer to the same object or function shall
have compatible type; otherwise, the behavior is undefined.
(And they are not compatible types.)
Most C compilers don't reject (or even detect!) code which has this
issue, but the GCC LTO development branch compiler does. (It
outputs the types of the objects while generating .o files, along
with a bunch of other information, then compares them when doing the
final link-time code generation pass.)
Patch from Savannah bug #25133.
* src/base/ftinit.c (FT_USE_MODULE): Include variable type.
* builds/amiga/include/freetype/config/ftmodule.h,
include/freetype/config/ftmodule.h, */module.mk: Updated to declare
pass correct types to FT_USE_MODULE.
2008-12-21 Hongbo Ni <hongbo@njstar.com> 2008-12-21 Hongbo Ni <hongbo@njstar.com>
* src/autofit/aflatin.c (af_latin_hint_edges), * src/autofit/aflatin.c (af_latin_hint_edges),
src/autofit/aflatin2.c (af_latin2_hint_edges), src/autofit/afcjk.c src/autofit/aflatin2.c (af_latin2_hint_edges), src/autofit/afcjk.c
(af_cjk_hint_edges): Protect against division by zero. (af_cjk_hint_edges): Protect against division by zero. This fixes
Savannah bug #25124.
2008-12-18 Werner Lemberg <wl@gnu.org> 2008-12-18 Werner Lemberg <wl@gnu.org>

40
builds/amiga/include/freetype/config/ftmodule.h
View File

@ -80,77 +80,77 @@
/* Now include the modules */ /* Now include the modules */
#ifdef FT_USE_AUTOFIT #ifdef FT_USE_AUTOFIT
FT_USE_MODULE(autofit_module_class) FT_USE_MODULE( FT_Module_Class, autofit_module_class )
#endif #endif
#ifdef FT_USE_TT #ifdef FT_USE_TT
FT_USE_MODULE(tt_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
#endif #endif
#ifdef FT_USE_T1 #ifdef FT_USE_T1
FT_USE_MODULE(t1_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
#endif #endif
#ifdef FT_USE_CFF #ifdef FT_USE_CFF
FT_USE_MODULE(cff_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
#endif #endif
#ifdef FT_USE_T1CID #ifdef FT_USE_T1CID
FT_USE_MODULE(t1cid_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
#endif #endif
#ifdef FT_USE_PFR #ifdef FT_USE_PFR
FT_USE_MODULE(pfr_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
#endif #endif
#ifdef FT_USE_T42 #ifdef FT_USE_T42
FT_USE_MODULE(t42_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
#endif #endif
#ifdef FT_USE_WINFNT #ifdef FT_USE_WINFNT
FT_USE_MODULE(winfnt_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
#endif #endif
#ifdef FT_USE_PCF #ifdef FT_USE_PCF
FT_USE_MODULE(pcf_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
#endif #endif
#ifdef FT_USE_PSAUX #ifdef FT_USE_PSAUX
FT_USE_MODULE(psaux_module_class) FT_USE_MODULE( FT_Module_Class, psaux_module_class )
#endif #endif
#ifdef FT_USE_PSNAMES #ifdef FT_USE_PSNAMES
FT_USE_MODULE(psnames_module_class) FT_USE_MODULE( FT_Module_Class, psnames_module_class )
#endif #endif
#ifdef FT_USE_PSHINT #ifdef FT_USE_PSHINT
FT_USE_MODULE(pshinter_module_class) FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
#endif #endif
#ifdef FT_USE_RASTER #ifdef FT_USE_RASTER
FT_USE_MODULE(ft_raster1_renderer_class) FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
#endif #endif
#ifdef FT_USE_SFNT #ifdef FT_USE_SFNT
FT_USE_MODULE(sfnt_module_class) FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
#endif #endif
#ifdef FT_USE_SMOOTH #ifdef FT_USE_SMOOTH
FT_USE_MODULE(ft_smooth_renderer_class) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
FT_USE_MODULE(ft_smooth_lcd_renderer_class) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
FT_USE_MODULE(ft_smooth_lcdv_renderer_class) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
#endif #endif
#ifdef FT_USE_OTV #ifdef FT_USE_OTV
FT_USE_MODULE(otv_module_class) FT_USE_MODULE( FT_Module_Class, otv_module_class )
#endif #endif
#ifdef FT_USE_BDF #ifdef FT_USE_BDF
FT_USE_MODULE(bdf_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
#endif #endif
#ifdef FT_USE_GXV #ifdef FT_USE_GXV
FT_USE_MODULE(gxv_module_class) FT_USE_MODULE( FT_Module_Class, gxv_module_class )
#endif #endif
/* /*

36
include/freetype/config/ftmodule.h
View File

@ -10,23 +10,23 @@
* *
*/ */
FT_USE_MODULE(autofit_module_class) FT_USE_MODULE( FT_Module_Class, autofit_module_class )
FT_USE_MODULE(tt_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, tt_driver_class )
FT_USE_MODULE(t1_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, t1_driver_class )
FT_USE_MODULE(cff_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, cff_driver_class )
FT_USE_MODULE(t1cid_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, t1cid_driver_class )
FT_USE_MODULE(pfr_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, pfr_driver_class )
FT_USE_MODULE(t42_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, t42_driver_class )
FT_USE_MODULE(winfnt_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, winfnt_driver_class )
FT_USE_MODULE(pcf_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, pcf_driver_class )
FT_USE_MODULE(psaux_module_class) FT_USE_MODULE( FT_Module_Class, psaux_module_class )
FT_USE_MODULE(psnames_module_class) FT_USE_MODULE( FT_Module_Class, psnames_module_class )
FT_USE_MODULE(pshinter_module_class) FT_USE_MODULE( FT_Module_Class, pshinter_module_class )
FT_USE_MODULE(ft_raster1_renderer_class) FT_USE_MODULE( FT_Renderer_Class, ft_raster1_renderer_class )
FT_USE_MODULE(sfnt_module_class) FT_USE_MODULE( FT_Module_Class, sfnt_module_class )
FT_USE_MODULE(ft_smooth_renderer_class) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_renderer_class )
FT_USE_MODULE(ft_smooth_lcd_renderer_class) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcd_renderer_class )
FT_USE_MODULE(ft_smooth_lcdv_renderer_class) FT_USE_MODULE( FT_Renderer_Class, ft_smooth_lcdv_renderer_class )
FT_USE_MODULE(bdf_driver_class) FT_USE_MODULE( FT_Driver_ClassRec, bdf_driver_class )
/* EOF */ /* EOF */

2
src/autofit/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += AUTOFIT_MODULE FTMODULE_H_COMMANDS += AUTOFIT_MODULE
define AUTOFIT_MODULE define AUTOFIT_MODULE
$(OPEN_DRIVER)autofit_module_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Module_Class, autofit_module_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)autofit $(ECHO_DRIVER_DESC)automatic hinting module$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)autofit $(ECHO_DRIVER_DESC)automatic hinting module$(ECHO_DRIVER_DONE)
endef endef

6
src/base/ftinit.c
View File

@ -55,9 +55,9 @@
#undef FT_USE_MODULE #undef FT_USE_MODULE
#ifdef __cplusplus #ifdef __cplusplus
#define FT_USE_MODULE( x ) extern "C" const FT_Module_Class x; #define FT_USE_MODULE( type, x ) extern "C" const type x;
#else #else
#define FT_USE_MODULE( x ) extern const FT_Module_Class x; #define FT_USE_MODULE( type, x ) extern const type x;
#endif #endif
@ -65,7 +65,7 @@
#undef FT_USE_MODULE #undef FT_USE_MODULE
#define FT_USE_MODULE( x ) (const FT_Module_Class*)&(x), #define FT_USE_MODULE( type, x ) (const FT_Module_Class*)&(x),
static static
const FT_Module_Class* const ft_default_modules[] = const FT_Module_Class* const ft_default_modules[] =

2
src/bdf/module.mk
View File

@ -27,7 +27,7 @@
FTMODULE_H_COMMANDS += BDF_DRIVER FTMODULE_H_COMMANDS += BDF_DRIVER
define BDF_DRIVER define BDF_DRIVER
$(OPEN_DRIVER)bdf_driver_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Driver_ClassRec, bdf_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)bdf $(ECHO_DRIVER_DESC)bdf bitmap fonts$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)bdf $(ECHO_DRIVER_DESC)bdf bitmap fonts$(ECHO_DRIVER_DONE)
endef endef

2
src/cff/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += CFF_DRIVER FTMODULE_H_COMMANDS += CFF_DRIVER
define CFF_DRIVER define CFF_DRIVER
$(OPEN_DRIVER)cff_driver_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Driver_ClassRec, cff_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)cff $(ECHO_DRIVER_DESC)OpenType fonts with extension *.otf$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)cff $(ECHO_DRIVER_DESC)OpenType fonts with extension *.otf$(ECHO_DRIVER_DONE)
endef endef

2
src/cid/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += TYPE1CID_DRIVER FTMODULE_H_COMMANDS += TYPE1CID_DRIVER
define TYPE1CID_DRIVER define TYPE1CID_DRIVER
$(OPEN_DRIVER)t1cid_driver_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Driver_ClassRec, t1cid_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)cid $(ECHO_DRIVER_DESC)Postscript CID-keyed fonts, no known extension$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)cid $(ECHO_DRIVER_DESC)Postscript CID-keyed fonts, no known extension$(ECHO_DRIVER_DONE)
endef endef

2
src/gxvalid/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += GXVALID_MODULE FTMODULE_H_COMMANDS += GXVALID_MODULE
define GXVALID_MODULE define GXVALID_MODULE
$(OPEN_DRIVER)gxv_module_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Module_Class, gxv_module_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)gxvalid $(ECHO_DRIVER_DESC)TrueTypeGX/AAT validation module$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)gxvalid $(ECHO_DRIVER_DESC)TrueTypeGX/AAT validation module$(ECHO_DRIVER_DONE)
endef endef

2
src/otvalid/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += OTVALID_MODULE FTMODULE_H_COMMANDS += OTVALID_MODULE
define OTVALID_MODULE define OTVALID_MODULE
$(OPEN_DRIVER)otv_module_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Module_Class, otv_module_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)otvalid $(ECHO_DRIVER_DESC)OpenType validation module$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)otvalid $(ECHO_DRIVER_DESC)OpenType validation module$(ECHO_DRIVER_DONE)
endef endef

2
src/pcf/module.mk
View File

@ -27,7 +27,7 @@
FTMODULE_H_COMMANDS += PCF_DRIVER FTMODULE_H_COMMANDS += PCF_DRIVER
define PCF_DRIVER define PCF_DRIVER
$(OPEN_DRIVER)pcf_driver_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Driver_ClassRec, pcf_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)pcf $(ECHO_DRIVER_DESC)pcf bitmap fonts$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)pcf $(ECHO_DRIVER_DESC)pcf bitmap fonts$(ECHO_DRIVER_DONE)
endef endef

2
src/pfr/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += PFR_DRIVER FTMODULE_H_COMMANDS += PFR_DRIVER
define PFR_DRIVER define PFR_DRIVER
$(OPEN_DRIVER)pfr_driver_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Driver_ClassRec, pfr_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)pfr $(ECHO_DRIVER_DESC)PFR/TrueDoc font files with extension *.pfr$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)pfr $(ECHO_DRIVER_DESC)PFR/TrueDoc font files with extension *.pfr$(ECHO_DRIVER_DONE)
endef endef

2
src/psaux/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += PSAUX_MODULE FTMODULE_H_COMMANDS += PSAUX_MODULE
define PSAUX_MODULE define PSAUX_MODULE
$(OPEN_DRIVER)psaux_module_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Module_Class, psaux_module_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)psaux $(ECHO_DRIVER_DESC)Postscript Type 1 & Type 2 helper module$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)psaux $(ECHO_DRIVER_DESC)Postscript Type 1 & Type 2 helper module$(ECHO_DRIVER_DONE)
endef endef

2
src/pshinter/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += PSHINTER_MODULE FTMODULE_H_COMMANDS += PSHINTER_MODULE
define PSHINTER_MODULE define PSHINTER_MODULE
$(OPEN_DRIVER)pshinter_module_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Module_Class, pshinter_module_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)pshinter $(ECHO_DRIVER_DESC)Postscript hinter module$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)pshinter $(ECHO_DRIVER_DESC)Postscript hinter module$(ECHO_DRIVER_DONE)
endef endef

2
src/psnames/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += PSNAMES_MODULE FTMODULE_H_COMMANDS += PSNAMES_MODULE
define PSNAMES_MODULE define PSNAMES_MODULE
$(OPEN_DRIVER)psnames_module_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Module_Class, psnames_module_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)psnames $(ECHO_DRIVER_DESC)Postscript & Unicode Glyph name handling$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)psnames $(ECHO_DRIVER_DESC)Postscript & Unicode Glyph name handling$(ECHO_DRIVER_DONE)
endef endef

2
src/raster/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += RASTER_MODULE FTMODULE_H_COMMANDS += RASTER_MODULE
define RASTER_MODULE define RASTER_MODULE
$(OPEN_DRIVER)ft_raster1_renderer_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Renderer_Class, ft_raster1_renderer_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)raster $(ECHO_DRIVER_DESC)monochrome bitmap renderer$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)raster $(ECHO_DRIVER_DESC)monochrome bitmap renderer$(ECHO_DRIVER_DONE)
endef endef

2
src/sfnt/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += SFNT_MODULE FTMODULE_H_COMMANDS += SFNT_MODULE
define SFNT_MODULE define SFNT_MODULE
$(OPEN_DRIVER)sfnt_module_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Module_Class, sfnt_module_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)sfnt $(ECHO_DRIVER_DESC)helper module for TrueType & OpenType formats$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)sfnt $(ECHO_DRIVER_DESC)helper module for TrueType & OpenType formats$(ECHO_DRIVER_DONE)
endef endef

6
src/smooth/module.mk
View File

@ -16,11 +16,11 @@
FTMODULE_H_COMMANDS += SMOOTH_RENDERER FTMODULE_H_COMMANDS += SMOOTH_RENDERER
define SMOOTH_RENDERER define SMOOTH_RENDERER
$(OPEN_DRIVER)ft_smooth_renderer_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Renderer_Class, ft_smooth_renderer_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)smooth $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)smooth $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer$(ECHO_DRIVER_DONE)
$(OPEN_DRIVER)ft_smooth_lcd_renderer_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Renderer_Class, ft_smooth_lcd_renderer_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)smooth $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer for LCDs$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)smooth $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer for LCDs$(ECHO_DRIVER_DONE)
$(OPEN_DRIVER)ft_smooth_lcdv_renderer_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Renderer_Class, ft_smooth_lcdv_renderer_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)smooth $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer for vertical LCDs$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)smooth $(ECHO_DRIVER_DESC)anti-aliased bitmap renderer for vertical LCDs$(ECHO_DRIVER_DONE)
endef endef

2
src/truetype/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += TRUETYPE_DRIVER FTMODULE_H_COMMANDS += TRUETYPE_DRIVER
define TRUETYPE_DRIVER define TRUETYPE_DRIVER
$(OPEN_DRIVER)tt_driver_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Driver_ClassRec, tt_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)truetype $(ECHO_DRIVER_DESC)Windows/Mac font files with extension *.ttf or *.ttc$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)truetype $(ECHO_DRIVER_DESC)Windows/Mac font files with extension *.ttf or *.ttc$(ECHO_DRIVER_DONE)
endef endef

2
src/type1/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += TYPE1_DRIVER FTMODULE_H_COMMANDS += TYPE1_DRIVER
define TYPE1_DRIVER define TYPE1_DRIVER
$(OPEN_DRIVER)t1_driver_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Driver_ClassRec, t1_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)type1 $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)type1 $(ECHO_DRIVER_DESC)Postscript font files with extension *.pfa or *.pfb$(ECHO_DRIVER_DONE)
endef endef

2
src/type42/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += TYPE42_DRIVER FTMODULE_H_COMMANDS += TYPE42_DRIVER
define TYPE42_DRIVER define TYPE42_DRIVER
$(OPEN_DRIVER)t42_driver_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Driver_ClassRec, t42_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)type42 $(ECHO_DRIVER_DESC)Type 42 font files with no known extension$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)type42 $(ECHO_DRIVER_DESC)Type 42 font files with no known extension$(ECHO_DRIVER_DONE)
endef endef

2
src/winfonts/module.mk
View File

@ -16,7 +16,7 @@
FTMODULE_H_COMMANDS += WINDOWS_DRIVER FTMODULE_H_COMMANDS += WINDOWS_DRIVER
define WINDOWS_DRIVER define WINDOWS_DRIVER
$(OPEN_DRIVER)winfnt_driver_class$(CLOSE_DRIVER) $(OPEN_DRIVER) FT_Driver_ClassRec, winfnt_driver_class $(CLOSE_DRIVER)
$(ECHO_DRIVER)winfnt $(ECHO_DRIVER_DESC)Windows bitmap fonts with extension *.fnt or *.fon$(ECHO_DRIVER_DONE) $(ECHO_DRIVER)winfnt $(ECHO_DRIVER_DESC)Windows bitmap fonts with extension *.fnt or *.fon$(ECHO_DRIVER_DONE)
endef endef