[PATCH v2 03/10] wineps: Remove unused fields from PSFONT structure.

[Piotr Caban]

From: Piotr Caban

---
 dlls/wineps.drv/builtin.c  | 5 -----
 dlls/wineps.drv/download.c | 5 -----
 dlls/wineps.drv/psdrv.h    | 5 -----
 dlls/wineps.drv/unixlib.c  | 5 -----
 4 files changed, 20 deletions(-)

diff --git a/dlls/wineps.drv/builtin.c b/dlls/wineps.drv/builtin.c
index 4fdbc58f099..f4be5eb37fb 100644
--- a/dlls/wineps.drv/builtin.c
+++ b/dlls/wineps.drv/builtin.c
@@ -138,11 +138,6 @@ static VOID ScaleFont(const AFM *afm, LONG lfHeight, PSFONT *font,
     tm->tmMaxCharWidth = (LONG)Round(
     	    (afm->FontBBox.urx - afm->FontBBox.llx) * font->fontinfo.Builtin.scale);

-    font->underlinePosition = afm->UnderlinePosition * font->fontinfo.Builtin.scale;
-    font->underlineThickness = afm->UnderlineThickness * font->fontinfo.Builtin.scale;
-    font->strikeoutPosition = tm->tmAscent / 2;
-    font->strikeoutThickness = font->underlineThickness;
-
     TRACE("Selected PS font '%s' size %d weight %ld.\n", afm->FontName,
           font->size.xx, tm->tmWeight );
     TRACE("H = %ld As = %ld Des = %ld IL = %ld EL = %ld\n", tm->tmHeight,
diff --git a/dlls/wineps.drv/download.c b/dlls/wineps.drv/download.c
index e8c3299e17c..191f8703e61 100644
--- a/dlls/wineps.drv/download.c
+++ b/dlls/wineps.drv/download.c
@@ -308,11 +308,6 @@ BOOL PSDRV_WriteSetDownloadFont(PHYSDEV dev, BOOL vertical)
     physDev->font.size.yx = -ps_round(ppem * xform.eM21);
     physDev->font.size.yy = -ps_round(ppem * xform.eM22);

-    physDev->font.underlineThickness = potm->otmsUnderscoreSize;
-    physDev->font.underlinePosition = potm->otmsUnderscorePosition;
-    physDev->font.strikeoutThickness = potm->otmsStrikeoutSize;
-    physDev->font.strikeoutPosition = potm->otmsStrikeoutPosition;
-
     if(physDev->font.fontinfo.Download == NULL) {
         RECT bbox;
         UINT emsize = get_bbox(dev->hdc, &bbox);
diff --git a/dlls/wineps.drv/psdrv.h b/dlls/wineps.drv/psdrv.h
index 40f590d0afd..3e6952f9618 100644
--- a/dlls/wineps.drv/psdrv.h
+++ b/dlls/wineps.drv/psdrv.h
@@ -316,11 +316,6 @@ typedef struct {

/* These are needed by PSDRV_ExtTextOut */
     int                 escapement;
-    int                 underlineThickness;
-    int                 underlinePosition;
-    int                 strikeoutThickness;
-    int                 strikeoutPosition;
-
 } PSFONT;

typedef struct {
diff --git a/dlls/wineps.drv/unixlib.c b/dlls/wineps.drv/unixlib.c
index 36971f65495..73181d9cd93 100644
--- a/dlls/wineps.drv/unixlib.c
+++ b/dlls/wineps.drv/unixlib.c
@@ -904,11 +904,6 @@ static void scale_font(const AFM *afm, LONG height, PSFONT *font, TEXTMETRICW *t
     tm->tmMaxCharWidth = (LONG)gdi_round(
             (afm->FontBBox.urx - afm->FontBBox.llx) * font->fontinfo.Builtin.scale);

-    font->underlinePosition = afm->UnderlinePosition * font->fontinfo.Builtin.scale;
-    font->underlineThickness = afm->UnderlineThickness * font->fontinfo.Builtin.scale;
-    font->strikeoutPosition = tm->tmAscent / 2;
-    font->strikeoutThickness = font->underlineThickness;
-
     TRACE("Selected PS font '%s' size %d weight %d.\n", afm->FontName,
           font->size.xx, (int)tm->tmWeight);
     TRACE("H = %d As = %d Des = %d IL = %d EL = %d\n", (int)tm->tmHeight,