r5398 vince - in /branches/vince/netsurf-fb/framebuffer: fb_16bpp_plotters.c fb_32bpp_plotters.c fb_8bpp_plotters.c

netsurf at semichrome.net netsurf at semichrome.net
Mon Sep 22 17:46:02 BST 2008


Author: vince
Date: Mon Sep 22 11:46:02 2008
New Revision: 5398

URL: http://source.netsurf-browser.org?rev=5398&view=rev
Log:
enable knockout renderer

Modified:
    branches/vince/netsurf-fb/framebuffer/fb_16bpp_plotters.c
    branches/vince/netsurf-fb/framebuffer/fb_32bpp_plotters.c
    branches/vince/netsurf-fb/framebuffer/fb_8bpp_plotters.c

Modified: branches/vince/netsurf-fb/framebuffer/fb_16bpp_plotters.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/framebuffer/fb_16bpp_plotters.c?rev=5398&r1=5397&r2=5398&view=diff
==============================================================================
--- branches/vince/netsurf-fb/framebuffer/fb_16bpp_plotters.c (original)
+++ branches/vince/netsurf-fb/framebuffer/fb_16bpp_plotters.c Mon Sep 22 11:46:02 2008
@@ -159,7 +159,8 @@
         uint16_t ent;
         uint16_t *pvideo;
 
-        fb_plotters_clip_rect_ctx(&x0, &y0, &x1, &y1);
+        if (!fb_plotters_clip_rect_ctx(&x0, &y0, &x1, &y1))
+                return true; /* fill lies outside current clipping region */
 
         ent = ((c & 0xF8) << 8) |
               ((c & 0xFC00 ) >> 5) |
@@ -406,7 +407,8 @@
 	.bitmap = fb_16bpp_bitmap,
 	.bitmap_tile = fb_16bpp_bitmap_tile,
 	.flush = fb_16bpp_flush,
-	.path = fb_16bpp_path
+	.path = fb_16bpp_path,
+        .option_knockout = true,
 };
 
 /*

Modified: branches/vince/netsurf-fb/framebuffer/fb_32bpp_plotters.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/framebuffer/fb_32bpp_plotters.c?rev=5398&r1=5397&r2=5398&view=diff
==============================================================================
--- branches/vince/netsurf-fb/framebuffer/fb_32bpp_plotters.c (original)
+++ branches/vince/netsurf-fb/framebuffer/fb_32bpp_plotters.c Mon Sep 22 11:46:02 2008
@@ -149,7 +149,8 @@
         uint32_t *pvid;
         uint32_t ent;
 
-        fb_plotters_clip_rect_ctx(&x0, &y0, &x1, &y1);
+        if (!fb_plotters_clip_rect_ctx(&x0, &y0, &x1, &y1))
+                return true; /* fill lies outside current clipping region */
 
         ent = ((c & 0xff0000) >> 16) | (c & 0xff00) | ((c & 0xff) << 16);
 
@@ -386,7 +387,8 @@
 	.bitmap = fb_32bpp_bitmap,
 	.bitmap_tile = fb_32bpp_bitmap_tile,
 	.flush = fb_32bpp_flush, 
-	.path = fb_32bpp_path
+	.path = fb_32bpp_path,
+        .option_knockout = true,
 };
 
 /*

Modified: branches/vince/netsurf-fb/framebuffer/fb_8bpp_plotters.c
URL: http://source.netsurf-browser.org/branches/vince/netsurf-fb/framebuffer/fb_8bpp_plotters.c?rev=5398&r1=5397&r2=5398&view=diff
==============================================================================
--- branches/vince/netsurf-fb/framebuffer/fb_8bpp_plotters.c (original)
+++ branches/vince/netsurf-fb/framebuffer/fb_8bpp_plotters.c Mon Sep 22 11:46:02 2008
@@ -101,9 +101,8 @@
         uint8_t ent;
         uint8_t *pvideo;
 
-        LOG(("%d, %d, %d, %d, 0x%lx", x0, y0, x1, y1, c));
-
-        fb_plotters_clip_rect_ctx(&x0, &y0, &x1, &y1);
+        if (!fb_plotters_clip_rect_ctx(&x0, &y0, &x1, &y1))
+                return true; /* fill lies outside current clipping region */
 
         pvideo = fb_8bpp_get_xy_loc(x0, y0);
 
@@ -289,7 +288,8 @@
 	.bitmap = fb_8bpp_bitmap,
 	.bitmap_tile = fb_8bpp_bitmap_tile,
 	.flush = fb_8bpp_flush, 
-	.path = fb_8bpp_path
+	.path = fb_8bpp_path,
+        .option_knockout = true,
 };
 
 




More information about the netsurf-commits mailing list