Add support for bitmap fonts.

configure

@@ -10541,6 +10541,7 @@ fi
 
 
 
+
 for ac_header in ft2build.h \
                          freetype/freetype.h \
                          freetype/ftglyph.h \
@@ -10549,6 +10550,7 @@ for ac_header in ft2build.h \
                          freetype/ftsnames.h \
                          freetype/ttnameid.h \
                          freetype/ftoutln.h \
+                         freetype/ftwinfnt.h \
                          freetype/internal/sfnt.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`

configure.ac

@@ -461,6 +461,7 @@ else
                          freetype/ftsnames.h \
                          freetype/ttnameid.h \
                          freetype/ftoutln.h \
+                         freetype/ftwinfnt.h \
                          freetype/internal/sfnt.h,,,
                          [#if HAVE_FT2BUILD_H
                           #include <ft2build.h>

include/config.h.in

@@ -110,6 +110,9 @@
 /* Define if you have the <freetype/fttrigon.h> header file. */
 #undef HAVE_FREETYPE_FTTRIGON_H
 
+/* Define to 1 if you have the <freetype/ftwinfnt.h> header file. */
+#undef HAVE_FREETYPE_FTWINFNT_H
+
 /* Define to 1 if you have the <freetype/internal/sfnt.h> header file. */
 #undef HAVE_FREETYPE_INTERNAL_SFNT_H
 

objects/font.c

@@ -627,8 +627,9 @@ static INT CALLBACK FONT_EnumInstance( const LOGFONTW *plf, const TEXTMETRICW *p
     DC *dc;
 
     /* lfCharSet is at the same offset in both LOGFONTA and LOGFONTW */
-    if( pfe->lpLogFontParam->lfCharSet == DEFAULT_CHARSET ||
-        pfe->lpLogFontParam->lfCharSet == plf->lfCharSet )
+    if((pfe->lpLogFontParam->lfCharSet == DEFAULT_CHARSET ||
+        pfe->lpLogFontParam->lfCharSet == plf->lfCharSet) &&
+       (!(fType & RASTER_FONTTYPE) || GetDeviceCaps(pfe->hdc, TEXTCAPS) & TC_RA_ABLE) )
     {
 	/* convert font metrics */
         ENUMLOGFONTEXA logfont;