Backport of r8515: Reset clipping upon exit of draw_markers to avoid negative interaction with blitting.

mdboom · mdboom · commit 514da05b1982 · 2010-07-07T13:19:29.000Z
svn path=/branches/v1_0_maint/; revision=8526
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -796,6 +796,8 @@ RendererAgg::draw_markers(const Py::Tuple& args)
             delete[] fillCache;
         if (strokeCache != staticStrokeCache)
             delete[] strokeCache;
+        theRasterizer.reset_clipping();
+        rendererBase.reset_clipping(true);
         throw;
     }
 
@@ -804,6 +806,9 @@ RendererAgg::draw_markers(const Py::Tuple& args)
     if (strokeCache != staticStrokeCache)
         delete[] strokeCache;
 
+    theRasterizer.reset_clipping();
+    rendererBase.reset_clipping(true);
+
     return Py::Object();
 }
 
@@ -1086,6 +1091,7 @@ RendererAgg::draw_image(const Py::Tuple& args)
     {
         set_clipbox(gc.cliprect, rendererBase);
         rendererBase.blend_from(pixf, 0, (int)x, (int)(height - (y + image->rowsOut)));
+        rendererBase.reset_clipping(true);
     }
 
     image->flipud_out(empty);

Original file line number	Diff line number	Diff line change
`@@ -796,6 +796,8 @@ RendererAgg::draw_markers(const Py::Tuple& args)`
`796`	`796`	`delete[] fillCache;`
`797`	`797`	`if (strokeCache != staticStrokeCache)`
`798`	`798`	`delete[] strokeCache;`
	`799`	`+ theRasterizer.reset_clipping();`
	`800`	`+ rendererBase.reset_clipping(true);`
`799`	`801`	`throw;`
`800`	`802`	`}`
`801`	`803`
`@@ -804,6 +806,9 @@ RendererAgg::draw_markers(const Py::Tuple& args)`
`804`	`806`	`if (strokeCache != staticStrokeCache)`
`805`	`807`	`delete[] strokeCache;`
`806`	`808`
	`809`	`+ theRasterizer.reset_clipping();`
	`810`	`+ rendererBase.reset_clipping(true);`
	`811`	`+`
`807`	`812`	`return Py::Object();`
`808`	`813`	`}`
`809`	`814`
`@@ -1086,6 +1091,7 @@ RendererAgg::draw_image(const Py::Tuple& args)`
`1086`	`1091`	`{`
`1087`	`1092`	`set_clipbox(gc.cliprect, rendererBase);`
`1088`	`1093`	`rendererBase.blend_from(pixf, 0, (int)x, (int)(height - (y + image->rowsOut)));`
	`1094`	`+ rendererBase.reset_clipping(true);`
`1089`	`1095`	`}`
`1090`	`1096`
`1091`	`1097`	`image->flipud_out(empty);`