https://git.reactos.org/?p=reactos.git;a=commitdiff;h=86ea03bf51528bde888d1a...
commit 86ea03bf51528bde888d1ad8d04821bbb0b2cf2b Author: Mark Jansen mark.jansen@reactos.org AuthorDate: Sat Dec 29 20:03:06 2018 +0100 Commit: Mark Jansen mark.jansen@reactos.org CommitDate: Sat Dec 29 20:06:04 2018 +0100
[FONT][WIN32SS] Re-add casts for gcc --- win32ss/gdi/ntgdi/freetype.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c index 309774c6ef..3ac442e4ef 100644 --- a/win32ss/gdi/ntgdi/freetype.c +++ b/win32ss/gdi/ntgdi/freetype.c @@ -256,7 +256,7 @@ RemoveCachedEntry(PFONT_CACHE_ENTRY Entry) { ASSERT_FREETYPE_LOCK_HELD();
- FT_Done_Glyph(Entry->BitmapGlyph); + FT_Done_Glyph((FT_Glyph)Entry->BitmapGlyph); RemoveEntryList(&Entry->ListEntry); ExFreePoolWithTag(Entry, TAG_FONT); g_FontCacheNumEntries--; @@ -2950,7 +2950,7 @@ ftGdiGlyphSet( if (FT_Bitmap_Convert(GlyphSlot->library, &BitmapGlyph->bitmap, &AlignedBitmap, 4)) { DPRINT1("Conversion failed\n"); - FT_Done_Glyph(BitmapGlyph); + FT_Done_Glyph((FT_Glyph)BitmapGlyph); return NULL; }
@@ -3007,7 +3007,7 @@ ftGdiGlyphCacheSet( DPRINT1("Conversion failed\n"); ExFreePoolWithTag(NewEntry, TAG_FONT); FT_Bitmap_Done(GlyphSlot->library, &AlignedBitmap); - FT_Done_Glyph(BitmapGlyph); + FT_Done_Glyph((FT_Glyph)BitmapGlyph); return NULL; }
@@ -4091,7 +4091,7 @@ TextIntGetTextExtentPoint(PDC dc, /* Bold and italic do not use the cache */ if (EmuBold || EmuItalic) { - FT_Done_Glyph(realglyph); + FT_Done_Glyph((FT_Glyph)realglyph); }
previous = glyph_index; @@ -5876,7 +5876,7 @@ GreExtTextOutW(
previous = glyph_index;
- FT_Done_Glyph(realglyph); + FT_Done_Glyph((FT_Glyph)realglyph); }
TextWidth = TextLeft - RealXStart; @@ -6053,7 +6053,7 @@ GreExtTextOutW( bResult = FALSE; if (EmuBold || EmuItalic) { - FT_Done_Glyph(realglyph); + FT_Done_Glyph((FT_Glyph)realglyph); }
break; @@ -6066,7 +6066,7 @@ GreExtTextOutW( bResult = FALSE; if (EmuBold || EmuItalic) { - FT_Done_Glyph(realglyph); + FT_Done_Glyph((FT_Glyph)realglyph); }
break; @@ -6119,7 +6119,7 @@ GreExtTextOutW( { if (EmuBold || EmuItalic) { - FT_Done_Glyph(realglyph); + FT_Done_Glyph((FT_Glyph)realglyph); }
break; @@ -6195,7 +6195,7 @@ GreExtTextOutW( /* No cache, so clean up */ if (EmuBold || EmuItalic) { - FT_Done_Glyph(realglyph); + FT_Done_Glyph((FT_Glyph)realglyph); } }