wineps.drv: Remove variables scale_xx, scale_xy, scale_yx, and scale_yy scale_yy from append_complex_glyph and simplify the code accordingly. (RESEND)
Gerald Pfeifer
gerald at pfeifer.com
Sat Sep 10 23:05:58 CDT 2011
Originally sent in May, addressing feedback from Nikolay.
Gerald
---
dlls/wineps.drv/type1.c | 23 +++--------------------
1 files changed, 3 insertions(+), 20 deletions(-)
diff --git a/dlls/wineps.drv/type1.c b/dlls/wineps.drv/type1.c
index e686853..e5ec645 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,13 @@ 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;
- }
+ ptr += 4;
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;
- }
+ ptr += 8;
start_pt = pts_in_outline(outline);
append_glyph_outline(hdc, index, outline);
--
1.7.6
More information about the wine-patches
mailing list