diff options
| author | Adrian Lees <adrian@aemulor.com> | 2009-02-27 02:29:59 +0000 |
|---|---|---|
| committer | Adrian Lees <adrian@aemulor.com> | 2009-02-27 02:29:59 +0000 |
| commit | fb8d9206468f2141e1cfc4107a72c9ad124121f1 (patch) | |
| tree | 565344d007792ccb2591e64d3f6471a129a1c681 | |
| parent | 464b7edf0c2446f427eb84e726b031d43a25ed0f (diff) | |
| download | netsurf-fb8d9206468f2141e1cfc4107a72c9ad124121f1.tar.gz netsurf-fb8d9206468f2141e1cfc4107a72c9ad124121f1.tar.bz2 | |
Fix silly oversights; still disabled for now
svn path=/trunk/netsurf/; revision=6653
| -rw-r--r-- | framebuffer/fb_32bpp_plotters.c | 35 | ||||
| -rw-r--r-- | framebuffer/fb_plotters.h | 4 |
2 files changed, 19 insertions, 20 deletions
diff --git a/framebuffer/fb_32bpp_plotters.c b/framebuffer/fb_32bpp_plotters.c index 6fad1b996..8bc4979ff 100644 --- a/framebuffer/fb_32bpp_plotters.c +++ b/framebuffer/fb_32bpp_plotters.c @@ -193,25 +193,24 @@ static bool fb_32bpp_fill(int x0, int y0, int x1, int y1, colour c) for (w = width; w > 0; w--) *pvid++ = ent; #else uint32_t *evid = pvid + width; - while ((pvid += 16) <= evid) { - pvid[0] = ent; - pvid[1] = ent; - pvid[2] = ent; - pvid[3] = ent; - pvid[4] = ent; - pvid[5] = ent; - pvid[6] = ent; - pvid[7] = ent; - pvid[8] = ent; - pvid[9] = ent; - pvid[10] = ent; - pvid[11] = ent; - pvid[12] = ent; - pvid[13] = ent; - pvid[14] = ent; - pvid[15] = ent; + while (pvid <= evid - 16) { + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; + *pvid++ = ent; } - pvid -= 16; while (pvid < evid) *pvid++ = ent; #endif pvid += llen; diff --git a/framebuffer/fb_plotters.h b/framebuffer/fb_plotters.h index 374228ee2..4b3102f03 100644 --- a/framebuffer/fb_plotters.h +++ b/framebuffer/fb_plotters.h @@ -50,7 +50,7 @@ bool fb_plotters_bitmap_tile(int x, int y, /* alpha blend two pixels together */ static inline colour fb_plotters_ablend(colour pixel, colour scrpixel) { -#if 1 +#if 0 int opacity = (pixel >> 24) & 0xFF; int r,g,b; @@ -74,7 +74,7 @@ static inline colour fb_plotters_ablend(colour pixel, colour scrpixel) g = ((pixel & 0x00FF00) * opacity + (scrpixel & 0x00FF00) * transp) >> 8; - return rb | g; + return (rb & 0xFF0FF) | (g & 0xFF00); #endif } |