matplotlib
diff --git a/‎CHANGELOG
Lines changed: 0 additions & 1 deletion b/‎CHANGELOG
Lines changed: 0 additions & 1 deletion
diff --git a/‎src/_backend_agg.cpp
Lines changed: 20 additions & 28 deletions b/‎src/_backend_agg.cpp
Lines changed: 20 additions & 28 deletions
diff --git a/‎src/_backend_agg.h
Lines changed: 2 additions & 1 deletion b/‎src/_backend_agg.h
Lines changed: 2 additions & 1 deletion
@@ -9,7 +9,6 @@ New entries should be added at the top
 2005-03-09 Refactored contour functionality into dedicated module
 
 2005-03-09 Added Eric's contourf updates and Nadia's clabel functionality
-           - TODO, factor clabel into a dedicated class
 
 2005-03-09 Moved colorbar to figure.Figure to expose it for API developers
           - JDH
 
@@ -113,10 +113,8 @@ GCAgg::_set_dashes(const Py::Object& gc) {
   //return the dashOffset, dashes sequence tuple.  
   _VERBOSE("GCAgg::_set_dashes");
 
-  if (dasha != NULL) {
-    delete [] dasha;
-    dasha = NULL;
-  }
+  delete [] dasha;
+  dasha = NULL;
 
   Py::Tuple dashtup = gc.getAttr("_dashes");
 
@@ -126,21 +124,20 @@ GCAgg::
10000
_set_dashes(const Py::Object& gc) {
 
   bool useDashes = dashtup[0].ptr() != Py_None;
 
-  if ( useDashes ) { 
-    
-    dashOffset = points_to_pixels(dashtup[0]);
-    Py::SeqBase<Py::Object> dashSeq;
-    dashSeq = dashtup[1]; 
+  if ( !useDashes ) return;  
 
-    Ndash = dashSeq.length();
-    if (Ndash%2 != 0  ) 
-      throw Py::ValueError(Printf("dash sequence must be an even length sequence; found %d", Ndash).str());     
+  dashOffset = points_to_pixels(dashtup[0]);
+  Py::SeqBase<Py::Object> dashSeq;
+  dashSeq = dashtup[1]; 
 
-    dasha = new double[Ndash];    
+  Ndash = dashSeq.length();
+  if (Ndash%2 != 0  ) 
+    throw Py::ValueError(Printf("dash sequence must be an even length sequence; found %d", Ndash).str());     
+  
+  dasha = new double[Ndash];    
 
-    for (size_t i=0; i<Ndash; i++) 
-      dasha[i] = points_to_pixels(dashSeq[i]);
-  }
+  for (size_t i=0; i<Ndash; i++) 
+    dasha[i] = points_to_pixels(dashSeq[i]);
 
 }
 
@@ -150,17 +147,14 @@ GCAgg::_set_clip_rectangle( const Py::Object& gc) {
   //set the clip rectangle from the gc
 
   _VERBOSE("GCAgg::set_clip_rectangle");
-  
-  
+
   delete [] cliprect;
-  Py::Object o ( gc.getAttr( "_cliprect" ) );
+  cliprect = NULL;
 
-  if (o.ptr()==Py_None) {
-    // set clipping to false and return success
-    delete [] cliprect;
-    cliprect=NULL;
+  Py::Object o ( gc.getAttr( "_cliprect" ) );
+  if (o.ptr()==Py_None) 
     return;
-  }
+  
 
   Py::SeqBase<Py::Object> rect( o );
 
@@ -169,7 +163,6 @@ GCAgg::_set_clip_rectangle( const Py::Object& gc) {
   double w = Py::Float(rect[2]) ; 
   double h = Py::Float(rect[3]) ; 
 
-  delete [] cliprect;
   cliprect = new double[4];
   cliprect[0] = l;
   cliprect[1] = b;
@@ -1056,9 +1049,9 @@ RendererAgg::_render_lines_path(agg::path_storage &path, const GCAgg& gc) {
 
 }
 
-/*
+
 Py::Object
-RendererAgg::draw_markers(const Py::Tuple& args) {
+RendererAgg::_draw_markers(const Py::Tuple& args) {
   //draw_markers(gc, path, rgbFace, xo, yo, transform)
   theRasterizer->reset_clipping();
 
@@ -1178,7 +1171,6 @@ RendererAgg::draw_markers(const Py::Tuple& args) {
 
 }
 
-*/
 
 Py::Object
 RendererAgg::draw_markers(const Py::Tuple& args) {
 
@@ -79,7 +79,7 @@ class GCAgg {
   void _set_antialiased( const Py::Object& gc);
 };
 
-// the renderer
+// th renderer
 class RendererAgg: public Py::PythonExtension<RendererAgg> {
   typedef std::pair<bool, agg::rgba> facepair_t;
 public:
@@ -97,6 +97,7 @@ class RendererAgg: public Py::PythonExtension<RendererAgg> {
   Py::Object draw_regpoly_collection(const Py::Tuple& args);
   Py::Object draw_lines(const Py::Tuple & args);
   Py::Object draw_path(const Py::Tuple & args);
+  Py::Object _draw_markers(const Py::Tuple & args);
   Py::Object draw_markers(const Py::Tuple & args);
   Py::Object draw_text(const Py::Tuple & args);
   Py::Object draw_image(const Py::Tuple & args);