commit d5354961d6ea9ab614e6359888a239c95fc88cdc
author Eric Kohl <ekohl@codeweavers.com> Mon Feb 12 01:15:06 2001 +0000
committer Alexandre Julliard <julliard@winehq.org> Mon Feb 12 01:15:06 2001 +0000
tree cea29060849f712c47dcfcc50183dfd956595387
parent d1c9c0c95b8abc59b31e6132c68feb019e81597b

Fixed text size calculation bug in GetTextExtentPoint() for window dc's.

graphics/x11drv/text.c

diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c
index be159f8..7c2f790 100644
--- a/graphics/x11drv/text.c
+++ b/graphics/x11drv/text.c
@@ -412,10 +412,10 @@
 	    X11DRV_cptable[pfo->fi->cptable].pTextExtents( pfo, p,
 				count, &dir, &ascent, &descent, &info_width );
 
-	   size->cx = abs((info_width + dc->breakRem + count *
-			   dc->charExtra) * (int)dc->xformWorld2Vport.eM11);
-	   size->cy = abs((pfo->fs->ascent + pfo->fs->descent) *
-			  (int)dc->xformWorld2Vport.eM22);
+          size->cx = fabs((FLOAT)(info_width + dc->breakRem + count *
+                                  dc->charExtra) * dc->xformVport2World.eM11);
+          size->cy = fabs((FLOAT)(pfo->fs->ascent + pfo->fs->descent) *
+                          dc->xformVport2World.eM22);
 	} else {
 	    INT i;
 	    float x = 0.0, y = 0.0;