made agg deps explicity in setup

svn path=/trunk/matplotlib/; revision=1065

Author: jdh2358

TODO

@@ -640,7 +640,7 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
     show()
 
 
--- fix contour mappable to work under changes in clim, cmap
+-- DONE fix contour mappable to work under changes in clim, cmap
 
 -- DONE make subplot delaxes on other subplots under it.
 
@@ -662,5 +662,5 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- add gc warning to oo agg and FAQ
 
--- check why lowest contour is not labeled in contour_demo2 and why
+-- DONE check why lowest contour is not labeled in contour_demo2 and why
    the colormap is still not applying to the contour.

lib/matplotlib/contour.py

@@ -162,8 +162,8 @@ def clabel(self, *args, **kwargs):
             self.ax.add_artist(label)
 
 
-        if hasattr(contours, 'mappable'):
-            old = getattr(contours, 'mappable')
+        old = getattr(contours, 'mappable')
+        if old is not None:
             mappable = ContourMappable(old.get_array(), toadd, cmap=old.cmap, labeld=self.labeld)            
             mappable.set_array(old.get_array())
             mappable.autoscale()

lib/matplotlib/font_manager.py

@@ -77,7 +77,7 @@
 if home is not None:
     # user fonts on OSX
     path = os.path.join(home, 'Library', 'Fonts')
-    X11FontDirectories.append(home)
+    X11FontDirectories.append(path)
 
 def win32FontDirectory():
     """Return the user-specified font directory for Win32."""

lib/matplotlib/lines.py

@@ -17,7 +17,7 @@
 from cbook import iterable, is_string_like
 from colors import colorConverter
 from patches import bbox_artist
-from path import MOVETO, LINETO, ENDPOLY
+
 from transforms import lbwh_to_bbox, LOG10
 from matplotlib import rcParams
 

setupext.py

@@ -381,10 +381,20 @@ def build_tkagg(ext_modules, packages, numerix):
 def build_agg(ext_modules, packages, numerix):
     global BUILT_AGG
     if BUILT_AGG: return # only build it if you you haven't already
-    
+
+
+    agg = ('agg_trans_affine.cpp',
+           'agg_path_storage.cpp',
+           'agg_vcgen_stroke.cpp',
+           'agg_bezier_arc.cpp',
+           'agg_curves.cpp',
+           'agg_vcgen_dash.cpp',
+           'agg_rasterizer_scanline_aa.cpp',
+           )
+
     if numerix in ["numarray","both"]: # Build for numarray
-        deps = ['src/ft2font.cpp', 'src/mplutils.cpp']
-        deps.extend(glob.glob('agg22/src/*.cpp'))
+        deps = ['agg22/src/%s'%name for name in agg]
+        deps.extend(('src/ft2font.cpp', 'src/mplutils.cpp'))
         deps.extend(glob.glob('CXX/*.cxx'))
         deps.extend(glob.glob('CXX/*.c'))
         temp_copy('src/_backend_agg.cpp', 'src/_na_backend_agg.cpp')
@@ -399,8 +409,8 @@ def build_agg(ext_modules, packages, numerix):
         add_ft2font_flags(module)
         ext_modules.append(module)    
     if numerix in ["Numeric","both"]: # Build for Numeric
-        deps = ['src/ft2font.cpp', 'src/mplutils.cpp']
-        deps.extend(glob.glob('agg22/src/*.cpp'))
+        deps = ['agg22/src/%s'%name for name in agg]
+        deps.extend(('src/ft2font.cpp', 'src/mplutils.cpp'))
         deps.extend(glob.glob('CXX/*.cxx'))
         deps.extend(glob.glob('CXX/*.c'))
 
@@ -423,10 +433,17 @@ def build_image(ext_modules, packages, numerix):
     global BUILT_IMAGE
     if BUILT_IMAGE: return # only build it if you you haven't already
 
+    agg = ('agg_trans_affine.cpp',
+           'agg_path_storage.cpp',
+           'agg_rasterizer_scanline_aa.cpp',
+           'agg_image_filters.cpp',
+           'agg_bezier_arc.cpp',
+           )
+
     if numerix in ["numarray","both"]: # Build for numarray
         temp_copy('src/_image.cpp', 'src/_na_image.cpp')
         deps = ['src/_na_image.cpp', 'src/mplutils.cpp'] 
-        deps.extend(glob.glob('agg22/src/*.cpp'))
+        deps.extend(['agg22/src/%s'%name for name in agg])
         deps.extend(glob.glob('CXX/*.cxx'))
         deps.extend(glob.glob('CXX/*.c'))
         module = Extension(
@@ -441,9 +458,10 @@ def build_image(ext_modules, packages, numerix):
     if numerix in ["Numeric","both"]: # Build for Numeric
         temp_copy('src/_image.cpp', 'src/_nc_image.cpp')
         deps = ['src/_nc_image.cpp', 'src/mplutils.cpp'] 
-        deps.extend(glob.glob('agg22/src/*.cpp'))
+        deps.extend(['agg22/src/%s'%name for name in agg])
         deps.extend(glob.glob('CXX/*.cxx'))
         deps.extend(glob.glob('CXX/*.c'))
+
         module = Extension(
             'matplotlib._nc_image',
             deps

src/_backend_agg.cpp

@@ -1799,7 +1799,7 @@ RendererAgg::~RendererAgg() {
   delete pixFmt;
   delete renderingBuffer;
   delete [] pixBuffer;
-  
+    
 }
 
 /* ------------ module methods ------------- */

src/_image.cpp

@@ -29,7 +29,7 @@
 #include "util/agg_color_conv_rgb8.h"
 #include "_image.h"
 #include "mplutils.h"
-
+  
 
 
 typedef agg::pixel_formats_rgba32<agg::order_rgba32> pixfmt;