commit 5c13c2189ef8b16e162785b391e07ec12d24c4ec
author Stas Sergeev <stas.orel@mailcity.com> Mon Jul 10 13:04:08 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Jul 10 13:04:08 2000 +0000
tree 818b4467100ed42b75e963b7fa312e4a9d3d7acb
parent 04da8b8f2812f830ec4d000238e85d49e41831e6

Make it possible to change the encoding of fonts from the command
line, even if autodetected.

tools/fnt2bdf.c

diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c
index 13811d8..e4280ab 100644
--- a/tools/fnt2bdf.c
+++ b/tools/fnt2bdf.c
@@ -352,6 +352,8 @@
 
       /* charset */
 
+     if( g_lpstrCharSet ) fprintf(fs, "%s\n", g_lpstrCharSet);
+     else
       switch( cpe_font_struct->hdr.dfCharSet[0] )
       {
 	/* Microsoft just had to invent its own charsets! */
@@ -370,12 +372,8 @@
 
 	default:
 	case OEM_CHARSET: 
-		if( !g_lpstrCharSet ) 
-		{ 
 		    fputs("Undefined charset, use -c option.\n", stderr); 
 		    return ERROR_DATA; 
-		}
-	        fprintf(fs, "%s\n", g_lpstrCharSet);
       }
     }
     else return ERROR_DATA;