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

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

Revision: 8598
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=8598&view=rev
Author:   mdboom
Date:     2010-07-30 12:28:08 +0000 (Fri, 30 Jul 2010)

Log Message:
-----------
Merged revisions 8592,8597 via svnmerge from 
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v1_0_maint

........
  r8592 | mdboom | 2010-07-29 10:09:11 -0400 (Thu, 29 Jul 2010) | 2 lines
  
  Remove points_to_pixels_snapto -- since it isn't used anywhere and is now actually incomplete wrt the new stroke-width-aware snapping.
........
  r8597 | mdboom | 2010-07-30 08:25:51 -0400 (Fri, 30 Jul 2010) | 1 line
  
  Update baseline image for pcolormesh test
........

Modified Paths:
--------------
    trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh.png
    trunk/matplotlib/src/_backend_agg.cpp
    trunk/matplotlib/src/_backend_agg.h

Property Changed:
----------------
    trunk/matplotlib/


Property changes on: trunk/matplotlib
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8590,8593,8595
   + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8597 /trunk/matplotlib:1-7315

Modified: trunk/matplotlib/lib/matplotlib/tests/baseline_images/test_axes/pcolormesh.png
===================================================================
(Binary files differ)

Modified: trunk/matplotlib/src/_backend_agg.cpp
===================================================================
--- trunk/matplotlib/src/_backend_agg.cpp	2010-07-30 12:25:51 UTC (rev 8597)
+++ trunk/matplotlib/src/_backend_agg.cpp	2010-07-30 12:28:08 UTC (rev 8598)
@@ -2245,18 +2245,6 @@
 
 
 double
-RendererAgg::points_to_pixels_snapto(const Py::Object& points)
-{
-    // convert a value in points to pixels depending on renderer dpi and
-    // screen pixels per inch
-    // snap return pixels to grid
-    _VERBOSE("RendererAgg::points_to_pixels_snapto");
-    double p = Py::Float(points) ;
-    return (int)(p*dpi / 72.0) + 0.5;
-}
-
-
-double
 RendererAgg::points_to_pixels(const Py::Object& points)
 {
     _VERBOSE("RendererAgg::points_to_pixels");

Modified: trunk/matplotlib/src/_backend_agg.h
===================================================================
--- trunk/matplotlib/src/_backend_agg.h	2010-07-30 12:25:51 UTC (rev 8597)
+++ trunk/matplotlib/src/_backend_agg.h	2010-07-30 12:28:08 UTC (rev 8598)
@@ -230,7 +230,6 @@
 
 protected:
     double points_to_pixels(const Py::Object& points);
-    double points_to_pixels_snapto(const Py::Object& points);
     agg::rgba rgb_to_color(const Py::SeqBase<Py::Object>& rgb, double alpha);
     facepair_t _get_rgba_face(const Py::Object& rgbFace, double alpha);
 


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