commit 4eb22c68b3a29e0d3b79f491f20551a0a4bbc643
author Bill Medland <medbi01@accpac.com> Wed Jul 18 20:00:44 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Jul 18 20:00:44 2001 +0000
tree a5977a78b5d0c57858e20d7aa0a5a5410bdc2113
parent 0249fcd560ff8e9bc65ba54f6bc4a664d24f2664

Make the font name and size settings reflect the data in the font file
rather than arbitrary values.

tools/fnt2bdf.c

diff --git a/tools/fnt2bdf.c b/tools/fnt2bdf.c
index cb854e9..ce773c5 100644
--- a/tools/fnt2bdf.c
+++ b/tools/fnt2bdf.c
@@ -338,8 +338,9 @@
       point_size = 10 * return_data_value(dfShort, &cpe_font_struct->hdr.fi.dfPoints );
       dpi = (l_cellheight * 720) / point_size;
 
-      fprintf(fs, "%d-%d-%d-%d-", l_cellheight, 10*l_cellheight, 72, 72);
-						/* point_size, dpi, dpi); */
+      fprintf(fs, "%d-%d-%d-%d-",l_cellheight, point_size, 
+            return_data_value (dfShort, &cpe_font_struct->hdr.fi.dfHorizRes),
+            return_data_value (dfShort, &cpe_font_struct->hdr.fi.dfVertRes));
 
       /* spacing */
 
@@ -379,7 +380,7 @@
     else return ERROR_DATA;
 
     fprintf(fs, "SIZE  %d  %d   %d\n",  
-	l_cellheight,
+        return_data_value(dfShort, &cpe_font_struct->hdr.fi.dfPoints ),
 	return_data_value(dfShort, &cpe_font_struct->hdr.fi.dfHorizRes),
 	return_data_value(dfShort, &cpe_font_struct->hdr.fi.dfVertRes));   /* dfVertRes[2] */