Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIN32SS][FONT] Fix font coordinate conversion CORE-15907 (#1452)

Browse source 
[WIN32SS][FONT] Fix font bounding box mapping for viewport CORE-15907
This commit is contained in:
Katayama Hirofumi MZ 2019-04-02 22:39:26 +09:00 committed by GitHub
parent c334c17d69
commit 635534005b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
win32ss/gdi/ntgdi/freetype.c
View file

@ -5880,28 +5880,41 @@ IntExtTextOutW(
// invert y axis
IntEscapeMatrix(&matEscape, -lfEscapement);
matWorld.yx = -matWorld.yx;
matWorld.xy = -matWorld.xy;
// convert vecs
for (i = 0; i < 9; ++i)
{
POINT pt;
FT_Vector_Transform(&vecs[i], &matWidth);
FT_Vector_Transform(&vecs[i], &matEscape);
vecs[i].x += (Start.x << 16) + (XStart64 << 10);
vecs[i].y += (Start.y << 16) + (YStart64 << 10);
pt.x = vecs[i].x >> 16;
pt.y = vecs[i].y >> 16;
IntLPtoDP(dc, &pt, 1);
vecs[i].x = pt.x + dc->ptlDCOrig.x;
vecs[i].y = pt.y + dc->ptlDCOrig.y;
FT_Vector_Transform(&vecs[i], &matWorld);
}
vecs[2].x += DeltaX64 << 10;
vecs[2].y += DeltaY64 << 10; // upper right
vecs[3].x += DeltaX64 << 10;
vecs[3].y += DeltaY64 << 10; // lower right
vecs[6].x += DeltaX64 << 10;
vecs[6].y += DeltaY64 << 10; // underline right
vecs[8].x += DeltaX64 << 10;
vecs[8].y += DeltaY64 << 10; // strike through right
{
POINT pt;
pt.x = Start.x + (XStart64 >> 6);
pt.y = Start.y + (YStart64 >> 6);
IntLPtoDP(dc, &pt, 1);
for (i = 0; i < 9; ++i)
{
vecs[i].x += pt.x << 16;
vecs[i].y += pt.y << 16;
vecs[i].x >>= 16;
vecs[i].y >>= 16;
vecs[i].x += dc->ptlDCOrig.x;
vecs[i].y += dc->ptlDCOrig.y;
}
}
vecs[2].x += DeltaX64 >> 6;
vecs[2].y += DeltaY64 >> 6; // upper right
vecs[3].x += DeltaX64 >> 6;
vecs[3].y += DeltaY64 >> 6; // lower right
vecs[6].x += DeltaX64 >> 6;
vecs[6].y += DeltaY64 >> 6; // underline right
vecs[8].x += DeltaX64 >> 6;
vecs[8].y += DeltaY64 >> 6; // strike through right
if (fuOptions & ETO_OPAQUE)
{