From d96c642ea56b011b4a14a1ca9a8f3d9bba9d60a6 Mon Sep 17 00:00:00 2001 From: Tor Andersson Date: Thu, 1 Jul 2010 17:21:59 +0200 Subject: Fix typo and rename some variables. --- draw/imagedraw.c | 4 ++-- draw/pathscan.c | 6 +++--- draw/porterduff.c | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'draw') diff --git a/draw/imagedraw.c b/draw/imagedraw.c index dd887f53..71bd4360 100644 --- a/draw/imagedraw.c +++ b/draw/imagedraw.c @@ -83,8 +83,8 @@ samplemask(byte *s, int w, int h, int u, int v) static inline void samplega(byte *s, int w, int h, int u, int v, byte *out) { - byte ab[4]; - byte cd[4]; + byte ab[2]; + byte cd[2]; int ui = u >> 16; int vi = v >> 16; int ud = u & 0xFFFF; diff --git a/draw/pathscan.c b/draw/pathscan.c index a7c595eb..f0b17e6a 100644 --- a/draw/pathscan.c +++ b/draw/pathscan.c @@ -510,7 +510,7 @@ static inline void blit(fz_pixmap *pix, int x, int y, fz_error fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, fz_bbox clip, - fz_pixmap *pix, unsigned char *argb, fz_pixmap *image, fz_matrix *invmat) + fz_pixmap *dest, unsigned char *color, fz_pixmap *image, fz_matrix *invmat) { fz_error error; unsigned char *deltas; @@ -546,7 +546,7 @@ fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, fz_bbox clip, { if (yd >= clip.y0 && yd < clip.y1) { - blit(pix, xmin + skipx, yd, deltas, skipx, clipn, argb, image, invmat); + blit(dest, xmin + skipx, yd, deltas, skipx, clipn, color, image, invmat); } } yd = yc; @@ -575,7 +575,7 @@ fz_scanconvert(fz_gel *gel, fz_ael *ael, int eofill, fz_bbox clip, if (yd >= clip.y0 && yd < clip.y1) { - blit(pix, xmin + skipx, yd, deltas, skipx, clipn, argb, image, invmat); + blit(dest, xmin + skipx, yd, deltas, skipx, clipn, color, image, invmat); } fz_free(deltas); diff --git a/draw/porterduff.c b/draw/porterduff.c index 884a3830..5c3339ec 100644 --- a/draw/porterduff.c +++ b/draw/porterduff.c @@ -301,7 +301,6 @@ path_w4i1o4(byte * restrict rgba, byte * restrict src, byte cov, int len, byte * byte g = rgba[1]; byte b = rgba[2]; int a = FZ_EXPAND(rgba[3]); - while (len--) { int ca; -- cgit v1.2.3