* PURPOSE: FreeType font engine interface
* PROGRAMMERS: Copyright 2001 Huw D M Davies for CodeWeavers.
* Copyright 2006 Dmitry Timoshkov for CodeWeavers.
- * Copyright 2016-2017 Katayama Hirofumi MZ.
+ * Copyright 2016-2018 Katayama Hirofumi MZ.
*/
/** Includes ******************************************************************/
}
static INT
-IntRequestFontSize(PDC dc, FT_Face face, LONG Width, LONG Height)
+IntRequestFontSize(PDC dc, PFONTGDI FontGDI, LONG Width, LONG Height)
{
FT_Size_RequestRec req;
+ FT_Face face = FontGDI->SharedFace->Face;
if (Width < 0)
Width = -Width;
plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;
- error = IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight);
+ error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
if (bDoLock)
IntUnLockFreeType();
Face = FontGDI->SharedFace->Face;
IntLockFreeType();
- Error = IntRequestFontSize(dc, Face, plf->lfWidth, plf->lfHeight);
+ Error = IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
FtSetCoordinateTransform(Face, DC_pmxWorldToDevice(dc));
IntUnLockFreeType();
if (0 != Error)
plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;
IntLockFreeType();
- IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight);
+ IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
FtSetCoordinateTransform(face, pmxWorldToDevice);
for (i = FirstChar; i < FirstChar+Count; i++)
plf = &TextObj->logfont.elfEnumLogfontEx.elfLogFont;
IntLockFreeType();
- IntRequestFontSize(dc, face, plf->lfWidth, plf->lfHeight);
+ IntRequestFontSize(dc, FontGDI, plf->lfWidth, plf->lfHeight);
FtSetCoordinateTransform(face, pmxWorldToDevice);
for (i = FirstChar; i < FirstChar+Count; i++)