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

Revision: 8526
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8526&view=rev
Author: mdboom
Date: 2010年07月07日 13:19:29 +0000 (2010年7月07日)
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.

Revision: 8792
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8792&view=rev
Author: mdboom
Date: 2010年11月12日 14:58:33 +0000 (2010年11月12日)
Log Message:
-----------
Clip all objects in Agg to the figure
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年11月10日 17:04:12 UTC (rev 8791)
+++ branches/v1_0_maint/src/_backend_agg.cpp	2010年11月12日 14:58:33 UTC (rev 8792)
@@ -431,6 +431,8 @@
 {
 rasterizer.clip_box(int(mpl_round(l)), height - int(mpl_round(b)),
 int(mpl_round(r)), height - int(mpl_round(t)));
+ } else {
+ rasterizer.clip_box(0, 0, width, height);
 }
 
 _VERBOSE("RendererAgg::set_clipbox done");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8796
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8796&view=rev
Author: mdboom
Date: 2010年11月12日 16:56:38 +0000 (2010年11月12日)
Log Message:
-----------
Fix indentation
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年11月12日 16:17:37 UTC (rev 8795)
+++ branches/v1_0_maint/src/_backend_agg.cpp	2010年11月12日 16:56:38 UTC (rev 8796)
@@ -431,9 +431,11 @@
 {
 rasterizer.clip_box(int(mpl_round(l)), height - int(mpl_round(b)),
 int(mpl_round(r)), height - int(mpl_round(t)));
- } else {
- rasterizer.clip_box(0, 0, width, height);
 }
+ else
+ {
+ rasterizer.clip_box(0, 0, width, height);
+ }
 
 _VERBOSE("RendererAgg::set_clipbox done");
 }
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 8820
 http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8820&view=rev
Author: mdboom
Date: 2010年12月09日 17:26:54 +0000 (2010年12月09日)
Log Message:
-----------
Fixed error message in Agg backend.
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年12月09日 17:25:11 UTC (rev 8819)
+++ branches/v1_0_maint/src/_backend_agg.cpp	2010年12月09日 17:26:54 UTC (rev 8820)
@@ -554,7 +554,7 @@
 }
 catch (Py::TypeError)
 {
- throw Py::TypeError("Invalid input arguments to draw_text_image");
+ throw Py::TypeError("Invalid input arguments to restore_region2");
 }
 
 
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.