fnt2bdf generate correct font name and size

Medland, Bill Bill.Medland at accpac.com
Tue Jul 17 10:46:45 CDT 2001


 <<diff12.txt>> 
-------------- next part --------------
Bill Medland (medbi01 at accpac.com)
Make the font name and size settings reflect the data in the font
file rather than arbitrary values.

Index: wine/tools/fnt2bdf.c
===================================================================
RCS file: /home/wine/wine/tools/fnt2bdf.c,v
retrieving revision 1.10
diff -u -r1.10 fnt2bdf.c
--- wine/tools/fnt2bdf.c	2000/12/01 21:32:58	1.10
+++ wine/tools/fnt2bdf.c	2001/07/17 15:17:55
@@ -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] */
 


More information about the wine-patches mailing list