Author: khornicek
Date: Mon Oct 20 14:26:47 2014
New Revision: 64847
URL: http://svn.reactos.org/svn/reactos?rev=64847&view=rev
Log:
[WIN32K]
- add a missing break and reshuffle the code a tiny bit to fix CIDs 514466 and
513487
- don't skip the terminating debug print for ft_glyph_format_bitmap
Modified:
trunk/reactos/win32ss/gdi/ntgdi/freetype.c
Modified: trunk/reactos/win32ss/gdi/ntgdi/freetype.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/freetype.c?rev=64847&r1=64846&r2=64847&view=diff
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/freetype.c [iso-8859-1] Mon Oct 20
14:26:47 2014
@@ -2083,7 +2083,7 @@
src += ft_face->glyph->bitmap.pitch;
dst += pitch;
}
- return needed;
+ break;
}
case ft_glyph_format_outline:
{
@@ -2113,22 +2113,24 @@
{
return GDI_ERROR;
}
+
+ start = pvBuf;
+ for (row = 0; row < height; row++)
+ {
+ ptr = start;
+ for (col = 0; col < width; col++, ptr++)
+ {
+ *ptr = (((int)*ptr) * mult + 128) / 256;
+ }
+ start += pitch;
+ }
+
+ break;
}
default:
DPRINT1("Loaded glyph format %x\n", ft_face->glyph->format);
return GDI_ERROR;
}
- start = pvBuf;
- for (row = 0; row < height; row++)
- {
- ptr = start;
- for (col = 0; col < width; col++, ptr++)
- {
- *ptr = (((int)*ptr) * mult + 128) / 256;
- }
- start += pitch;
- }
- break;
}
case GGO_NATIVE:
