[PATCH v2 2/4] gdi32: Remove incoming_font argument of get_advance_metric().

[Huw Davies]

From: Byeongsik Jeon

Signed-off-by: Byeongsik Jeon 
Signed-off-by: Huw Davies 
---
 dlls/gdi32/freetype.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index d6cdaa12e98..18eb56fdae9 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2781,13 +2781,13 @@ static inline BYTE get_max_level( UINT format )
     return 255;
 }

-static FT_Vector get_advance_metric(struct gdi_font *incoming_font, struct gdi_font *font,
-                                    const FT_Glyph_Metrics *metrics,
-                                    const FT_Matrix *transMat, BOOL vertical_metrics)
+static FT_Vector get_advance_metric( struct gdi_font *font, const FT_Glyph_Metrics *metrics,
+                                     const FT_Matrix *transMat, BOOL vertical_metrics )
 {
     FT_Vector adv;
     FT_Fixed base_advance, em_scale = 0;
     BOOL fixed_pitch_full = FALSE;
+    struct gdi_font *incoming_font = font->base_font ? font->base_font : font;

if (vertical_metrics)
         base_advance = metrics->vertAdvance;
@@ -2890,8 +2890,7 @@ static FT_BBox get_transformed_bbox( const FT_Glyph_Metrics *metrics,
     return bbox;
 }

-static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *font,
-                             FT_BBox bbox, const FT_Glyph_Metrics *metrics,
+static void compute_metrics( struct gdi_font *font, FT_BBox bbox, const FT_Glyph_Metrics *metrics,
                              BOOL vertical, BOOL vertical_metrics,
                              BOOL needs_transform, const FT_Matrix matrices[3],
                              GLYPHMETRICS *gm, ABC *abc )
@@ -2900,7 +2899,7 @@ static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *fo

if (!needs_transform)
     {
-        adv = get_advance_metric( incoming_font, font, metrics, NULL, vertical_metrics );
+        adv = get_advance_metric( font, metrics, NULL, vertical_metrics );
         gm->gmCellIncX = adv.x >> 6;
         gm->gmCellIncY = 0;
         origin.x = bbox.xMin;
@@ -2933,13 +2932,11 @@ static void compute_metrics( struct gdi_font *incoming_font, struct gdi_font *fo
             lsb = metrics->horiBearingX;
         }

-        adv = get_advance_metric( incoming_font, font, metrics, &matrices[matrix_hori],
-                                  vertical_metrics );
+        adv = get_advance_metric( font, metrics, &matrices[matrix_hori], vertical_metrics );
         gm->gmCellIncX = adv.x >> 6;
         gm->gmCellIncY = adv.y >> 6;

-        adv = get_advance_metric( incoming_font, font, metrics, &matrices[matrix_unrotated],
-                                  vertical_metrics );
+        adv = get_advance_metric( font, metrics, &matrices[matrix_unrotated], vertical_metrics );
         adv.x = pFT_Vector_Length( &adv );
         adv.y = 0;

@@ -3565,8 +3562,8 @@ static DWORD CDECL freetype_get_glyph_outline( struct gdi_font *font, UINT glyph
     }

bbox = get_transformed_bbox( &metrics, needsTransform, matrices );
-    compute_metrics( base_font, font, bbox, &metrics, tategaki,
-                     vertical_metrics, needsTransform, matrices, lpgm, abc );
+    compute_metrics( font, bbox, &metrics, tategaki, vertical_metrics, needsTransform, matrices,
+                     lpgm, abc );

switch (format)
     {