fixed ps image bug

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

Author: jdh2358

CHANGELOG

@@ -1,5 +1,7 @@
 New entries should be added at the top
 
+2005-08-24 Fixes a PS image bug reported by Darren - JDH
+
 2005-08-23 colors.py: change hex2color() to accept unicode strings as well as
            normal strings. Use isinstance() instead of types.IntType etc - SC
 

TODO

@@ -709,4 +709,9 @@ ZeroDivisionError: SeparableTransformation::eval_scalars yin interval is zero; c
 
 -- DONE merge qt patch.
 
--- add frac kwarg to 
+-- properly handle sys.arv, so that it does not conflict with library
+   usage of mpl. mpl processes -Dagg, --verbose-helpful, etc, itself,
+   which can conflict with code that uses mpl as a library and process
+   options itself.
+
+-- Darren's black band ps image problem.

lib/matplotlib/__init__.py

@@ -143,7 +143,7 @@
 from __future__ import generators
 
 
-__version__  = '0.84cvs'
+__version__  = '0.84cvs1'
 __revision__ = '$Revision$'
 __date__     = '$Date$'
 

lib/matplotlib/backends/backend_ps.py

@@ -277,11 +277,12 @@ def _rgba(self, im):
         return im.as_rgba_str()
 
     def _rgb(self, im):
-        rgbat = im.as_rgba_str()
-        rgba = fromstring(rgbat[2], UInt8)
-        rgba.shape = (rgbat[0], rgbat[1], 4)
+        h,w,s = im.as_rgba_str()
+        
+        rgba = fromstring(s, UInt8)
+        rgba.shape = (h, w, 4)
         rgb = rgba[:,:,:3]
-        return rgbat[0], rgbat[1], rgb.tostring()
+        return h, w, rgb.tostring()
 
     def _gray(self, im, rc=0.3, gc=0.59, bc=0.11):
         rgbat = im.as_rgba_str()
@@ -327,6 +328,7 @@ def draw_image(self, x, y, im, bbox):
 
         figh = self.height*72
         #print 'values', origin, flipud, figh, h, y
+
         if bbox is not None:
             clipx,clipy,clipw,cliph = bbox.get_bounds()
             clip = '%s clipbox' % _nums_to_str(clipw, cliph, clipx, clipy)

lib/matplotlib/texmanager.py

@@ -136,6 +136,7 @@ def make_png(self, tex, dpi, force=0):
         prefix = self.get_prefix(tex)
         pngfile = os.path.join(self.texcache, '%s_%d.png'% (prefix, dpi))
 
+        self.get_dvipng_version()  # raises if dvipng is not up-to-date
         #print 'makepng', prefix, dvifile, pngfile
         command = 'dvipng -bg Transparent -fg "rgb 0.0 0.0 0.0" -D %d -T tight -o "%s" "%s"'% (dpi, pngfile, dvifile)
 

setup.py

@@ -43,7 +43,7 @@
 BUILD_WINDOWING        = 'auto'
 
 
-VERBOSE =  False # insert lots of diagnostic prints in extension code
+VERBOSE = False # insert lots of diagnostic prints in extension code
 
 
 

src/_image.cpp

@@ -563,7 +563,7 @@ Image::_get_output_buffer() {
   if (flipy) {
     agg::int8u* buffer = new agg::int8u[rowsOut*colsOut*4];
     agg::rendering_buffer rb;
-    rb.attach(buffer, rowsOut, colsOut, colsOut*4);
+    rb.attach(buffer, colsOut, rowsOut, colsOut*4);
     rb.copy_from(*rbufOut);
     ret.first = buffer;
     ret.second = true;