Make it possible to change the encoding of fonts from the command

line, even if autodetected.
This commit is contained in:
Stas Sergeev 2000-07-10 13:04:08 +00:00 committed by Alexandre Julliard
parent 04da8b8f28
commit 5c13c2189e
1 changed files with 2 additions and 4 deletions

View File

@ -352,6 +352,8 @@ int l_ascent = return_data_value(dfShort, cpe_font_struct->hdr.dfAscent);
/* charset */ /* charset */
if( g_lpstrCharSet ) fprintf(fs, "%s\n", g_lpstrCharSet);
else
switch( cpe_font_struct->hdr.dfCharSet[0] ) switch( cpe_font_struct->hdr.dfCharSet[0] )
{ {
/* Microsoft just had to invent its own charsets! */ /* Microsoft just had to invent its own charsets! */
@ -370,12 +372,8 @@ int l_ascent = return_data_value(dfShort, cpe_font_struct->hdr.dfAscent);
default: default:
case OEM_CHARSET: case OEM_CHARSET:
if( !g_lpstrCharSet )
{
fputs("Undefined charset, use -c option.\n", stderr); fputs("Undefined charset, use -c option.\n", stderr);
return ERROR_DATA; return ERROR_DATA;
}
fprintf(fs, "%s\n", g_lpstrCharSet);
} }
} }
else return ERROR_DATA; else return ERROR_DATA;