Author: tlsa Date: Thu Feb 26 18:12:22 2009 New Revision: 6650 URL: http://source.netsurf-browser.org?rev=6650&view=rev Log: Fixed version of r6647. Modified: trunk/netsurf/framebuffer/fb_16bpp_plotters.c trunk/netsurf/framebuffer/fb_32bpp_plotters.c Modified: trunk/netsurf/framebuffer/fb_16bpp_plotters.c URL: http://source.netsurf-browser.org/trunk/netsurf/framebuffer/fb_16bpp_plot... ============================================================================== --- trunk/netsurf/framebuffer/fb_16bpp_plotters.c (original) +++ trunk/netsurf/framebuffer/fb_16bpp_plotters.c Thu Feb 26 18:12:22 2009 @@ -462,14 +462,15 @@ width = (x1 - x0); xoff = x0 - x; - yoff = y0 - y; + yoff = (y0 - y) * bitmap->width; + height = height * bitmap->width + yoff; /* plot the image */ pvideo = fb_16bpp_get_xy_loc(x0, y0); - for (yloop = 0; yloop < height; yloop++) { + for (yloop = yoff; yloop < height; yloop += bitmap->width) { for (xloop = 0; xloop < width; xloop++) { - abpixel = pixel[((yoff + yloop) * bitmap->width) + xloop + xoff]; + abpixel = pixel[yloop + xloop + xoff]; if ((abpixel & 0xFF000000) != 0) { if ((abpixel & 0xFF000000) != 0xFF000000) { abpixel = fb_plotters_ablend(abpixel, 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 18:12:22 2009 @@ -518,14 +518,15 @@ width = (x1 - x0); xoff = x0 - x; - yoff = y0 - y; + yoff = (y0 - y) * bitmap->width; + height = height * bitmap->width + yoff; /* plot the image */ pvideo = fb_32bpp_get_xy_loc(x0, y0); - for (yloop = 0; yloop < height; yloop++) { + for (yloop = yoff; yloop < height; yloop += bitmap->width) { for (xloop = 0; xloop < width; xloop++) { - abpixel = pixel[((yoff + yloop) * bitmap->width) + xloop + xoff]; + abpixel = pixel[yloop + xloop + xoff]; if ((abpixel & 0xFF000000) != 0) { if ((abpixel & 0xFF000000) != 0xFF000000) { abpixel = fb_plotters_ablend(abpixel,