mirror of
https://github.com/reactos/reactos.git
synced 2024-06-30 01:42:30 +00:00
[WIN32SS:NTGDI] Fix missing text in labels and buttons for .NET apps. CORE-15000
There was a missing break statement in ftGdiGetGlyphOutline(). Found by JIRA contributor 'I_Kill_Bugs' :-) Add also brackets around 'case's to make code navigation easier.
This commit is contained in:
parent
bc534efbc5
commit
0e56ec8892
|
@ -3693,6 +3693,7 @@ ftGdiGetGlyphOutline(
|
||||||
switch (iFormat)
|
switch (iFormat)
|
||||||
{
|
{
|
||||||
case GGO_BITMAP:
|
case GGO_BITMAP:
|
||||||
|
{
|
||||||
width = gm.gmBlackBoxX;
|
width = gm.gmBlackBoxX;
|
||||||
height = gm.gmBlackBoxY;
|
height = gm.gmBlackBoxY;
|
||||||
pitch = ((width + 31) >> 5) << 2;
|
pitch = ((width + 31) >> 5) << 2;
|
||||||
|
@ -3720,6 +3721,7 @@ ftGdiGetGlyphOutline(
|
||||||
}
|
}
|
||||||
|
|
||||||
case ft_glyph_format_outline:
|
case ft_glyph_format_outline:
|
||||||
|
{
|
||||||
ft_bitmap.width = width;
|
ft_bitmap.width = width;
|
||||||
ft_bitmap.rows = height;
|
ft_bitmap.rows = height;
|
||||||
ft_bitmap.pitch = pitch;
|
ft_bitmap.pitch = pitch;
|
||||||
|
@ -3737,12 +3739,15 @@ ftGdiGetGlyphOutline(
|
||||||
FT_Outline_Get_Bitmap(g_FreeTypeLibrary, &ft_face->glyph->outline, &ft_bitmap);
|
FT_Outline_Get_Bitmap(g_FreeTypeLibrary, &ft_face->glyph->outline, &ft_bitmap);
|
||||||
IntUnLockFreeType();
|
IntUnLockFreeType();
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format);
|
DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format);
|
||||||
return GDI_ERROR;
|
return GDI_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
case GGO_GRAY2_BITMAP:
|
case GGO_GRAY2_BITMAP:
|
||||||
case GGO_GRAY4_BITMAP:
|
case GGO_GRAY4_BITMAP:
|
||||||
|
@ -3828,6 +3833,8 @@ ftGdiGetGlyphOutline(
|
||||||
DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format);
|
DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format);
|
||||||
return GDI_ERROR;
|
return GDI_ERROR;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case GGO_NATIVE:
|
case GGO_NATIVE:
|
||||||
|
@ -3855,6 +3862,7 @@ ftGdiGetGlyphOutline(
|
||||||
IntUnLockFreeType();
|
IntUnLockFreeType();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
case GGO_BEZIER:
|
case GGO_BEZIER:
|
||||||
{
|
{
|
||||||
FT_Outline *outline = &ft_face->glyph->outline;
|
FT_Outline *outline = &ft_face->glyph->outline;
|
||||||
|
|
Loading…
Reference in a new issue