SF.net SVN: matplotlib:[8526] branches/v1_0_maint/src/_backend_agg.cpp

[<md...@us...>]

Revision: 8526
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8526&view=rev
Author:   mdboom
Date:     2010-07-07 13:19:29 +0000 (Wed, 07 Jul 2010)

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

Modified Paths:
--------------
    branches/v1_0_maint/src/_backend_agg.cpp

Modified: branches/v1_0_maint/src/_backend_agg.cpp
===================================================================
--- branches/v1_0_maint/src/_backend_agg.cpp	2010-07-07 03:10:32 UTC (rev 8525)
+++ branches/v1_0_maint/src/_backend_agg.cpp	2010-07-07 13:19:29 UTC (rev 8526)
@@ -796,6 +796,8 @@
             delete[] fillCache;
         if (strokeCache != staticStrokeCache)
             delete[] strokeCache;
+        theRasterizer.reset_clipping();
+        rendererBase.reset_clipping(true);
         throw;
     }
 
@@ -804,6 +806,9 @@
     if (strokeCache != staticStrokeCache)
         delete[] strokeCache;
 
+    theRasterizer.reset_clipping();
+    rendererBase.reset_clipping(true);
+
     return Py::Object();
 }
 
@@ -1086,6 +1091,7 @@
     {
         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);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.