SF.net SVN: matplotlib:[6610] trunk/matplotlib

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

Revision: 6610
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=6610&view=rev
Author:   mdboom
Date:     2008-12-15 14:21:15 +0000 (Mon, 15 Dec 2008)

Log Message:
-----------
Merged revisions 6589,6608-6609 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint

........
  r6589 | mmetz_bn | 2008-12-12 08:58:24 -0500 (Fri, 12 Dec 2008) | 1 line
  
  fix warning in hist for numpy 1.2
........
  r6608 | mdboom | 2008-12-15 09:16:27 -0500 (Mon, 15 Dec 2008) | 2 lines
  
  Fix gridlines not moving correctly during pan and zoom
........
  r6609 | mdboom | 2008-12-15 09:18:03 -0500 (Mon, 15 Dec 2008) | 2 lines
  
  Turn off anti-aliasing when auto-snapping.
........

Modified Paths:
--------------
    trunk/matplotlib/CHANGELOG
    trunk/matplotlib/lib/matplotlib/transforms.py
    trunk/matplotlib/src/_backend_agg.cpp

Property Changed:
----------------
    trunk/matplotlib/
    trunk/matplotlib/doc/pyplots/README


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6587
   + /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-6609
Modified: svn:mergeinfo
   - /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587
   + /branches/v0_91_maint:5753-5771
/branches/v0_98_5_maint:6581,6585,6587,6589-6609

Modified: trunk/matplotlib/CHANGELOG
===================================================================
--- trunk/matplotlib/CHANGELOG	2008-12-15 14:18:03 UTC (rev 6609)
+++ trunk/matplotlib/CHANGELOG	2008-12-15 14:21:15 UTC (rev 6610)
@@ -1,3 +1,7 @@
+2008-12-15 Fix anti-aliasing when auto-snapping - MGD
+
+2008-12-15 Fix grid lines not moving correctly during pan and zoom - MGD
+
 2008-12-12 Preparations to eliminate maskedarray rcParams key: its
            use will now generate a warning.  Similarly, importing
            the obsolote numerix.npyma will generate a warning. - EF


Property changes on: trunk/matplotlib/doc/pyplots/README
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587
   + /branches/v0_98_5_maint/doc/pyplots/README:6581,6585,6587,6589-6609

Modified: trunk/matplotlib/lib/matplotlib/transforms.py
===================================================================
--- trunk/matplotlib/lib/matplotlib/transforms.py	2008-12-15 14:18:03 UTC (rev 6609)
+++ trunk/matplotlib/lib/matplotlib/transforms.py	2008-12-15 14:21:15 UTC (rev 6610)
@@ -120,8 +120,7 @@
             root = stack.pop()
             # Stop at subtrees that have already been invalidated
             if root._invalid != value or root.pass_through:
-                value |= root._invalid
-                root._invalid = value
+                root._invalid = self.INVALID
                 stack.extend(root._parents.keys())
 
     def set_children(self, *children):

Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp	2008-12-15 14:18:03 UTC (rev 6609)
+++ trunk/matplotlib/src/_backend_agg.cpp	2008-12-15 14:21:15 UTC (rev 6610)
@@ -355,7 +355,7 @@
 }
 
 template<class Path>
-bool should_snap(const GCAgg& gc, Path& path, const agg::trans_affine& trans) {
+bool should_snap(GCAgg& gc, Path& path, const agg::trans_affine& trans) {
   // If this contains only straight horizontal or vertical lines, it should be
   // quantized to the nearest pixels
   double x0, y0, x1, y1;
@@ -393,6 +393,7 @@
     }
 
     path.rewind(0);
+    gc.isaa = false;
     return true;
   case GCAgg::SNAP_FALSE:
     return false;


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