Sync with trunk r63935.

[reactos.git] / win32ss / drivers / font / bmfd / glyph.c

diff --git a/win32ss/drivers/font/bmfd/glyph.c b/win32ss/drivers/font/bmfd/glyph.c
index 55e0cdb..ebc5f06 100644 (file)
--- a/win32ss/drivers/font/bmfd/glyph.c
+++ b/win32ss/drivers/font/bmfd/glyph.c
@@ -7,8 +7,8 @@
 
 #include "bmfd.h"
 
-ULONG
 FORCEINLINE
+ULONG
 _ReadPixel(
     CHAR* pjBits,
     ULONG x,
@@ -21,8 +21,8 @@ _ReadPixel(
 }
 
 
-VOID
 FORCEINLINE
+VOID
 _WritePixel(
     CHAR* pjBits,
     ULONG x,
@@ -118,8 +118,8 @@ BmfdQueryGlyphAndBitmap(
     }
     else
     {
-        cxDst = cxSrc * yScale;
-        cyDst = cySrc * xScale;
+        cxDst = cxSrc * xScale;
+        cyDst = cySrc * yScale;
     }
     cjDstRow = (cxDst + 7) / 8;
 
@@ -154,7 +154,7 @@ BmfdQueryGlyphAndBitmap(
         }
 
         /* Fill GLYPHBITS structure */
-        pgb->ptlOrigin.x = yScale * pface->wA;
+        pgb->ptlOrigin.x = xScale * pface->wA;
         pgb->ptlOrigin.y = - yScale * pface->wAscent;
         pgb->sizlBitmap.cx = cxDst;
         pgb->sizlBitmap.cy = cyDst;