Nikolay Sivov : dwrite: Remove some unused fields.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 98d88f22e20dbd3a5ee804314868503a5c176ebd
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=98d88f22e20dbd3a5ee804314...

Author: Nikolay Sivov 
Date:   Wed Dec  8 14:10:46 2021 +0300

dwrite: Remove some unused fields.

Signed-off-by: Nikolay Sivov 
Signed-off-by: Alexandre Julliard

---

dlls/dwrite/dwrite_private.h |  2 --
 dlls/dwrite/font.c           | 16 ----------------
 dlls/dwrite/layout.c         |  1 -
 3 files changed, 19 deletions(-)

diff --git a/dlls/dwrite/dwrite_private.h b/dlls/dwrite/dwrite_private.h
index dd346191662..024741388cf 100644
--- a/dlls/dwrite/dwrite_private.h
+++ b/dlls/dwrite/dwrite_private.h
@@ -445,8 +445,6 @@ struct dwrite_glyphbitmap
 {
     DWORD simulations;
     float emsize;
-    BOOL nohint;
-    BOOL aliased;
     UINT16 glyph;
     INT pitch;
     RECT bbox;
diff --git a/dlls/dwrite/font.c b/dlls/dwrite/font.c
index ffe012d3029..5815c09e8ae 100644
--- a/dlls/dwrite/font.c
+++ b/dlls/dwrite/font.c
@@ -5942,19 +5942,6 @@ static ULONG WINAPI glyphrunanalysis_Release(IDWriteGlyphRunAnalysis *iface)
     return refcount;
 }

-static BOOL is_natural_rendering_mode(DWRITE_RENDERING_MODE1 mode)
-{
-    switch (mode)
-    {
-    case DWRITE_RENDERING_MODE1_NATURAL:
-    case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC:
-    case DWRITE_RENDERING_MODE1_NATURAL_SYMMETRIC_DOWNSAMPLED:
-        return TRUE;
-    default:
-        return FALSE;
-    }
-}
-
 static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *analysis, RECT *bounds)
 {
     struct dwrite_glyphbitmap glyph_bitmap;
@@ -5971,7 +5958,6 @@ static void glyphrunanalysis_get_texturebounds(struct dwrite_glyphrunanalysis *a
     memset(&glyph_bitmap, 0, sizeof(glyph_bitmap));
     glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(analysis->run.fontFace);
     glyph_bitmap.emsize = analysis->run.fontEmSize;
-    glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode);
     if (analysis->flags & RUNANALYSIS_USE_TRANSFORM)
         glyph_bitmap.m = &analysis->m;

@@ -6051,8 +6037,6 @@ static HRESULT glyphrunanalysis_render(struct dwrite_glyphrunanalysis *analysis)
     memset(&glyph_bitmap, 0, sizeof(glyph_bitmap));
     glyph_bitmap.simulations = fontface->simulations;
     glyph_bitmap.emsize = analysis->run.fontEmSize;
-    glyph_bitmap.nohint = is_natural_rendering_mode(analysis->rendering_mode);
-    glyph_bitmap.aliased = analysis->rendering_mode == DWRITE_RENDERING_MODE1_ALIASED;
     if (analysis->flags & RUNANALYSIS_USE_TRANSFORM)
         glyph_bitmap.m = &analysis->m;
     if (!(glyph_bitmap.buf = malloc(analysis->max_glyph_bitmap_size)))
diff --git a/dlls/dwrite/layout.c b/dlls/dwrite/layout.c
index 51fa6cbfbe6..2b5e8433d2d 100644
--- a/dlls/dwrite/layout.c
+++ b/dlls/dwrite/layout.c
@@ -3946,7 +3946,6 @@ static void layout_get_erun_bbox(struct dwrite_textlayout *layout, struct layout
         memset(&glyph_bitmap, 0, sizeof(glyph_bitmap));
         glyph_bitmap.simulations = IDWriteFontFace_GetSimulations(glyph_run.fontFace);
         glyph_bitmap.emsize = glyph_run.fontEmSize;
-        glyph_bitmap.nohint = layout->measuringmode == DWRITE_MEASURING_MODE_NATURAL;

bbox = &glyph_bitmap.bbox;