[ros-diffs] [reactos] 07/07: [FONT][WIN32SS] Remove casts

[Mark Jansen]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=85db46d75cb302c484306…

commit 85db46d75cb302c4843066b1af536f474940ea5b
Author:     Mark Jansen <mark.jansen(a)reactos.org>
AuthorDate: Sat Dec 29 19:46:37 2018 +0100
Commit:     Mark Jansen <mark.jansen(a)reactos.org>
CommitDate: Sat Dec 29 19:47:00 2018 +0100

    [FONT][WIN32SS] Remove casts
---
 win32ss/gdi/ntgdi/freetype.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/win32ss/gdi/ntgdi/freetype.c b/win32ss/gdi/ntgdi/freetype.c
index 93abca4f90..309774c6ef 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((FT_Glyph)Entry->BitmapGlyph);
+    FT_Done_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((FT_Glyph)BitmapGlyph);
+        FT_Done_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((FT_Glyph)BitmapGlyph);
+        FT_Done_Glyph(BitmapGlyph);
         return NULL;
     }
 
@@ -4088,10 +4088,10 @@ TextIntGetTextExtentPoint(PDC dc,
             Dx[i] = (TotalWidth + 32) >> 6;
         }
 
+        /* Bold and italic do not use the cache */
         if (EmuBold || EmuItalic)
         {
-            FT_Done_Glyph((FT_Glyph)realglyph);
-            realglyph = NULL;
+            FT_Done_Glyph(realglyph);
         }
 
         previous = glyph_index;
@@ -6192,10 +6192,10 @@ GreExtTextOutW(
 
         previous = glyph_index;
 
+        /* No cache, so clean up */
         if (EmuBold || EmuItalic)
         {
-            FT_Done_Glyph((FT_Glyph)realglyph);
-            realglyph = NULL;
+            FT_Done_Glyph(realglyph);
         }
     }