Author: adrianl Date: Thu Feb 26 20:29:59 2009 New Revision: 6653 URL: http://source.netsurf-browser.org?rev=6653&view=rev Log: Fix silly oversights; still disabled for now Modified: trunk/netsurf/framebuffer/fb_32bpp_plotters.c trunk/netsurf/framebuffer/fb_plotters.h Modified: trunk/netsurf/framebuffer/fb_32bpp_plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_32bpp_plot... ============================================================================== --- trunk/netsurf/framebuffer/fb_32bpp_plotters.c (original) +++ trunk/netsurf/framebuffer/fb_32bpp_plotters.c Thu Feb 26 20:29:59 2009 @@ -193,25 +193,24 @@ 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; - } - pvid -= 16; + 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; + } while (pvid < evid) *pvid++ = ent; #endif pvid += llen; Modified: trunk/netsurf/framebuffer/fb_plotters.h URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_plotters.h... ============================================================================== --- trunk/netsurf/framebuffer/fb_plotters.h (original) +++ trunk/netsurf/framebuffer/fb_plotters.h Thu Feb 26 20:29:59 2009 @@ -50,7 +50,7 @@ /* 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 @@ g = ((pixel & 0x00FF00) * opacity + (scrpixel & 0x00FF00) * transp) >> 8; - return rb | g; + return (rb & 0xFF0FF) | (g & 0xFF00); #endif }