wineps.drv: Remove variables scale_xx, scale_xy, scale_yx, and scale_yy and two dozen lines of dead code from append_complex_glyph.

Gerald Pfeifer gerald at pfeifer.com
Fri May 7 16:36:08 CDT 2010


This one felt a bit like peeling an onion, but indeed while we have been 
setting those three variables, we're never using them.  And also ptr is 
not used beyond this point, so we can remove a bunch of dead code.

Huw, I noticed you seem to have added this code only two weeks ago with
commit 76146568afc8c4b2c4fcd996429d3bb9133c12a9 ?  Are you planning to
build upon this, or can it go?

Gerald
---
 dlls/wineps.drv/type1.c |   24 ------------------------
 1 files changed, 0 insertions(+), 24 deletions(-)

diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c
index bc33ef6..fb2e39a 100644
--- a/dlls/wineps.drv/type1.c
+++ b/dlls/wineps.drv/type1.c
@@ -414,7 +414,6 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli
     const BYTE *ptr = data;
     WORD flags, index;
     short arg1, arg2;
-    WORD scale_xx = 1, scale_xy = 0, scale_yx = 0, scale_yy = 1;
     WORD start_pt, end_pt;
 
     ptr += 10;
@@ -436,29 +435,6 @@ static BOOL append_complex_glyph(HDC hdc, const BYTE *data, glyph_outline *outli
             arg1 = *(char*)ptr++;
             arg2 = *(char*)ptr++;
         }
-        if(flags & WE_HAVE_A_SCALE)
-        {
-            scale_xx = scale_yy = get_be_word(ptr);
-            ptr += 2;
-        }
-        else if(flags & WE_HAVE_AN_X_AND_Y_SCALE)
-        {
-            scale_xx = get_be_word(ptr);
-            ptr += 2;
-            scale_yy = get_be_word(ptr);
-            ptr += 2;
-        }
-        else if(flags & WE_HAVE_A_TWO_BY_TWO)
-        {
-            scale_xx = get_be_word(ptr);
-            ptr += 2;
-            scale_xy = get_be_word(ptr);
-            ptr += 2;
-            scale_yx = get_be_word(ptr);
-            ptr += 2;
-            scale_yy = get_be_word(ptr);
-            ptr += 2;
-        }
 
         start_pt = pts_in_outline(outline);
         append_glyph_outline(hdc, index, outline);
-- 
1.6.6.2



More information about the wine-patches mailing list