Fix the clippath renderering so that it uses no-clip unsigned chars

mdboom · mdboom · commit 00acff280669 · 2013-03-22T11:58:35.000-04:00
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -422,9 +422,8 @@ RendererAgg::create_alpha_buffers()
 {
     if (!alphaBuffer)
     {
-        unsigned stride(width*4);
-        alphaBuffer = new agg::int8u[NUMBYTES];
-        alphaMaskRenderingBuffer.attach(alphaBuffer, width, height, stride);
+        alphaBuffer = new agg::int8u[width * height];
+        alphaMaskRenderingBuffer.attach(alphaBuffer, width, height, width);
         rendererBaseAlphaMask.attach(pixfmtAlphaMask);
         rendererAlphaMask.attach(rendererBaseAlphaMask);
     }
@@ -1120,7 +1119,7 @@ RendererAgg::draw_image(const Py::Tuple& args)
             renderer_type_alpha ri(r, sa, spans);
 
             theRasterizer.add_path(rect2);
-            agg::render_scanlines(theRasterizer, slineP8, ri);
+            agg::render_scanlines(theRasterizer, scanlineAlphaMask, ri);
         }
         else
         {
@@ -1178,7 +1177,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,
                 amask_ren_type r(pfa);
                 amask_aa_renderer_type ren(r);
                 ren.color(face.second);
-                agg::render_scanlines(theRasterizer, slineP8, ren);
+                agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);
             }
             else
             {
@@ -1194,7 +1193,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,
                 amask_ren_type r(pfa);
                 amask_bin_renderer_type ren(r);
                 ren.color(face.second);
-                agg::render_scanlines(theRasterizer, slineP8, ren);
+                agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);
             }
             else
             {
@@ -1304,7 +1303,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,
                 amask_ren_type r(pfa);
                 amask_aa_renderer_type ren(r);
                 ren.color(gc.color);
-                agg::render_scanlines(theRasterizer, slineP8, ren);
+                agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);
             }
             else
             {
@@ -1320,7 +1319,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,
                 amask_ren_type r(pfa);
                 amask_bin_renderer_type ren(r);
                 ren.color(gc.color);
-                agg::render_scanlines(theRasterizer, slineP8, ren);
+                agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);
             }
             else
             {
@@ -1902,7 +1901,7 @@ RendererAgg::_draw_gouraud_triangle(const double* points,
         pixfmt_amask_type pfa(pixFmt, alphaMask);
         amask_ren_type r(pfa);
         amask_aa_renderer_type ren(r, span_alloc, span_gen);
-        agg::render_scanlines(theRasterizer, slineP8, ren);
+        agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);
     }
     else
     {
diff --git a/src/_backend_agg.h b/src/_backend_agg.h
@@ -62,6 +62,7 @@ typedef agg::rasterizer_scanline_aa<agg::rasterizer_sl_clip_dbl> rasterizer;
 typedef agg::scanline_p8 scanline_p8;
 typedef agg::scanline_bin scanline_bin;
 typedef agg::amask_no_clip_gray8 alpha_mask_type;
+typedef agg::scanline_u8_am<alpha_mask_type> scanline_am;
 
 typedef agg::renderer_base<agg::pixfmt_gray8> renderer_base_alpha_mask_type;
 typedef agg::renderer_scanline_aa_solid<renderer_base_alpha_mask_type> renderer_alpha_mask_type;
@@ -215,7 +216,7 @@ class RendererAgg: public Py::PythonExtension<RendererAgg>
     agg::pixfmt_gray8 pixfmtAlphaMask;
     renderer_base_alpha_mask_type rendererBaseAlphaMask;
     renderer_alpha_mask_type rendererAlphaMask;
-    agg::scanline_p8 scanlineAlphaMask;
+    scanline_am scanlineAlphaMask;
 
     scanline_p8 slineP8;
     scanline_bin slineBin;

Original file line number	Diff line number	Diff line change
`@@ -422,9 +422,8 @@ RendererAgg::create_alpha_buffers()`
`422`	`422`	`{`
`423`	`423`	`if (!alphaBuffer)`
`424`	`424`	`{`
`425`		`- unsigned stride(width*4);`
`426`		`- alphaBuffer = new agg::int8u[NUMBYTES];`
`427`		`- alphaMaskRenderingBuffer.attach(alphaBuffer, width, height, stride);`
	`425`	`+ alphaBuffer = new agg::int8u[width * height];`
	`426`	`+ alphaMaskRenderingBuffer.attach(alphaBuffer, width, height, width);`
`428`	`427`	`rendererBaseAlphaMask.attach(pixfmtAlphaMask);`
`429`	`428`	`rendererAlphaMask.attach(rendererBaseAlphaMask);`
`430`	`429`	`}`
`@@ -1120,7 +1119,7 @@ RendererAgg::draw_image(const Py::Tuple& args)`
`1120`	`1119`	`renderer_type_alpha ri(r, sa, spans);`
`1121`	`1120`
`1122`	`1121`	`theRasterizer.add_path(rect2);`
`1123`		`- agg::render_scanlines(theRasterizer, slineP8, ri);`
	`1122`	`+ agg::render_scanlines(theRasterizer, scanlineAlphaMask, ri);`
`1124`	`1123`	`}`
`1125`	`1124`	`else`
`1126`	`1125`	`{`
`@@ -1178,7 +1177,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,`
`1178`	`1177`	`amask_ren_type r(pfa);`
`1179`	`1178`	`amask_aa_renderer_type ren(r);`
`1180`	`1179`	`ren.color(face.second);`
`1181`		`- agg::render_scanlines(theRasterizer, slineP8, ren);`
	`1180`	`+ agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);`
`1182`	`1181`	`}`
`1183`	`1182`	`else`
`1184`	`1183`	`{`
`@@ -1194,7 +1193,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,`
`1194`	`1193`	`amask_ren_type r(pfa);`
`1195`	`1194`	`amask_bin_renderer_type ren(r);`
`1196`	`1195`	`ren.color(face.second);`
`1197`		`- agg::render_scanlines(theRasterizer, slineP8, ren);`
	`1196`	`+ agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);`
`1198`	`1197`	`}`
`1199`	`1198`	`else`
`1200`	`1199`	`{`
`@@ -1304,7 +1303,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,`
`1304`	`1303`	`amask_ren_type r(pfa);`
`1305`	`1304`	`amask_aa_renderer_type ren(r);`
`1306`	`1305`	`ren.color(gc.color);`
`1307`		`- agg::render_scanlines(theRasterizer, slineP8, ren);`
	`1306`	`+ agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);`
`1308`	`1307`	`}`
`1309`	`1308`	`else`
`1310`	`1309`	`{`
`@@ -1320,7 +1319,7 @@ void RendererAgg::_draw_path(path_t& path, bool has_clippath,`
`1320`	`1319`	`amask_ren_type r(pfa);`
`1321`	`1320`	`amask_bin_renderer_type ren(r);`
`1322`	`1321`	`ren.color(gc.color);`
`1323`		`- agg::render_scanlines(theRasterizer, slineP8, ren);`
	`1322`	`+ agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);`
`1324`	`1323`	`}`
`1325`	`1324`	`else`
`1326`	`1325`	`{`
`@@ -1902,7 +1901,7 @@ RendererAgg::_draw_gouraud_triangle(const double* points,`
`1902`	`1901`	`pixfmt_amask_type pfa(pixFmt, alphaMask);`
`1903`	`1902`	`amask_ren_type r(pfa);`
`1904`	`1903`	`amask_aa_renderer_type ren(r, span_alloc, span_gen);`
`1905`		`- agg::render_scanlines(theRasterizer, slineP8, ren);`
	`1904`	`+ agg::render_scanlines(theRasterizer, scanlineAlphaMask, ren);`
`1906`	`1905`	`}`
`1907`	`1906`	`else`
`1908`	`1907`	`{`