Skip to content

W
wine-cw
Commit 433c3cfe authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard
Browse files
Options

gdi32: Don't return cached glyph metrics if a custom transformation was requested.

parent 7ef47122
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
dlls/gdi32/freetype.c
View file @ 433c3cfe
...@@ -4327,8 +4327,13 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format, ...@@ -4327,8 +4327,13 @@ DWORD WineEngGetGlyphOutline(GdiFont *incoming_font, UINT glyph, UINT format,
font->gm = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, font->gm, font->gm = HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, font->gm,
font->gmsize * sizeof(GM*)); font->gmsize * sizeof(GM*));
} else { } else {
if(format == GGO_METRICS && font->gm[original_index / GM_BLOCK_SIZE] != NULL && FONT_GM(font,original_index)->init ) { if (format == GGO_METRICS && font->gm[original_index / GM_BLOCK_SIZE] != NULL &&
FONT_GM(font,original_index)->init && (!lpmat || is_identity_MAT2(lpmat)))
{
*lpgm = FONT_GM(font,original_index)->gm; *lpgm = FONT_GM(font,original_index)->gm;
TRACE("cached: %u,%u,%s,%d,%d\n", lpgm->gmBlackBoxX, lpgm->gmBlackBoxY,
wine_dbgstr_point(&lpgm->gmptGlyphOrigin),
lpgm->gmCellIncX, lpgm->gmCellIncY);
LeaveCriticalSection( &freetype_cs ); LeaveCriticalSection( &freetype_cs );
return 1; /* FIXME */ return 1; /* FIXME */
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment