Author: gschneider
Date: Fri Apr 10 23:46:06 2009
New Revision: 40445
URL:
http://svn.reactos.org/svn/reactos?rev=40445&view=rev
Log:
Amendment to r40444: float -> double changes were not supposed to go in
Modified:
trunk/reactos/subsystems/win32/win32k/objects/coord.c
Modified: trunk/reactos/subsystems/win32/win32k/objects/coord.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/coord.c [iso-8859-1] Fri Apr 10 23:46:06
2009
@@ -1057,19 +1057,19 @@
DC_UpdateXforms(PDC dc)
{
XFORM xformWnd2Vport;
- DOUBLE scaleX, scaleY;
+ FLOAT scaleX, scaleY;
PDC_ATTR pdcattr = dc->pdcattr;
XFORM xformWorld2Vport, xformWorld2Wnd, xformVport2World;
/* Construct a transformation to do the window-to-viewport conversion */
- scaleX = (pdcattr->szlWindowExt.cx ? (DOUBLE)pdcattr->szlViewportExt.cx /
(DOUBLE)pdcattr->szlWindowExt.cx : 0.0f);
- scaleY = (pdcattr->szlWindowExt.cy ? (DOUBLE)pdcattr->szlViewportExt.cy /
(DOUBLE)pdcattr->szlWindowExt.cy : 0.0f);
+ scaleX = (pdcattr->szlWindowExt.cx ? (FLOAT)pdcattr->szlViewportExt.cx /
(FLOAT)pdcattr->szlWindowExt.cx : 0.0f);
+ scaleY = (pdcattr->szlWindowExt.cy ? (FLOAT)pdcattr->szlViewportExt.cy /
(FLOAT)pdcattr->szlWindowExt.cy : 0.0f);
xformWnd2Vport.eM11 = scaleX;
xformWnd2Vport.eM12 = 0.0;
xformWnd2Vport.eM21 = 0.0;
xformWnd2Vport.eM22 = scaleY;
- xformWnd2Vport.eDx = (DOUBLE)pdcattr->ptlViewportOrg.x - scaleX *
(DOUBLE)pdcattr->ptlWindowOrg.x;
- xformWnd2Vport.eDy = (DOUBLE)pdcattr->ptlViewportOrg.y - scaleY *
(DOUBLE)pdcattr->ptlWindowOrg.y;
+ xformWnd2Vport.eDx = (FLOAT)pdcattr->ptlViewportOrg.x - scaleX *
(FLOAT)pdcattr->ptlWindowOrg.x;
+ xformWnd2Vport.eDy = (FLOAT)pdcattr->ptlViewportOrg.y - scaleY *
(FLOAT)pdcattr->ptlWindowOrg.y;
/* Combine with the world transformation */
MatrixS2XForm(&xformWorld2Vport, &dc->dclevel.mxWorldToDevice);