[FONT][WIN32SS] Remove casts

This commit is contained in:
Mark Jansen 2018-12-29 19:46:37 +01:00
parent 971c657b80
commit 85db46d75c
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B

View file

@ -256,7 +256,7 @@ RemoveCachedEntry(PFONT_CACHE_ENTRY Entry)
{ {
ASSERT_FREETYPE_LOCK_HELD(); ASSERT_FREETYPE_LOCK_HELD();
FT_Done_Glyph((FT_Glyph)Entry->BitmapGlyph); FT_Done_Glyph(Entry->BitmapGlyph);
RemoveEntryList(&Entry->ListEntry); RemoveEntryList(&Entry->ListEntry);
ExFreePoolWithTag(Entry, TAG_FONT); ExFreePoolWithTag(Entry, TAG_FONT);
g_FontCacheNumEntries--; g_FontCacheNumEntries--;
@ -2950,7 +2950,7 @@ ftGdiGlyphSet(
if (FT_Bitmap_Convert(GlyphSlot->library, &BitmapGlyph->bitmap, &AlignedBitmap, 4)) if (FT_Bitmap_Convert(GlyphSlot->library, &BitmapGlyph->bitmap, &AlignedBitmap, 4))
{ {
DPRINT1("Conversion failed\n"); DPRINT1("Conversion failed\n");
FT_Done_Glyph((FT_Glyph)BitmapGlyph); FT_Done_Glyph(BitmapGlyph);
return NULL; return NULL;
} }
@ -3007,7 +3007,7 @@ ftGdiGlyphCacheSet(
DPRINT1("Conversion failed\n"); DPRINT1("Conversion failed\n");
ExFreePoolWithTag(NewEntry, TAG_FONT); ExFreePoolWithTag(NewEntry, TAG_FONT);
FT_Bitmap_Done(GlyphSlot->library, &AlignedBitmap); FT_Bitmap_Done(GlyphSlot->library, &AlignedBitmap);
FT_Done_Glyph((FT_Glyph)BitmapGlyph); FT_Done_Glyph(BitmapGlyph);
return NULL; return NULL;
} }
@ -4088,10 +4088,10 @@ TextIntGetTextExtentPoint(PDC dc,
Dx[i] = (TotalWidth + 32) >> 6; Dx[i] = (TotalWidth + 32) >> 6;
} }
/* Bold and italic do not use the cache */
if (EmuBold || EmuItalic) if (EmuBold || EmuItalic)
{ {
FT_Done_Glyph((FT_Glyph)realglyph); FT_Done_Glyph(realglyph);
realglyph = NULL;
} }
previous = glyph_index; previous = glyph_index;
@ -6192,10 +6192,10 @@ GreExtTextOutW(
previous = glyph_index; previous = glyph_index;
/* No cache, so clean up */
if (EmuBold || EmuItalic) if (EmuBold || EmuItalic)
{ {
FT_Done_Glyph((FT_Glyph)realglyph); FT_Done_Glyph(realglyph);
realglyph = NULL;
} }
} }