Merge remote-tracking branch 'upstream/v1.2.x'

Author: mdboom

doc/conf.py

@@ -57,7 +57,7 @@
 
 # General substitutions.
 project = 'Matplotlib'
-copyright = '2012 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the matplotlib development team'
+copyright = '2013 John Hunter, Darren Dale, Eric Firing, Michael Droettboom and the matplotlib development team'
 
 # The default replacements for |version| and |release|, also used in various
 # other places throughout the built documents.

lib/matplotlib/backends/backend_svg.py

@@ -743,12 +743,9 @@ def draw_image(self, gc, x, y, im, dx=None, dy=None, transform=None):
             self.writer.start(u'g', attrib={u'clip-path': u'url(#%s)' % clipid})
 
         trans = [1,0,0,1,0,0]
-        h,w = im.get_size_out()
         if rcParams['svg.image_noscale']:
             trans = list(im.get_matrix())
             trans[5] = -trans[5]
-            trans[3] = -trans[3]
-            y += h
             attrib[u'transform'] = generate_transform([(u'matrix', tuple(trans))])
             assert trans[1] == 0
             assert trans[2] == 0

src/_image.cpp

@@ -440,15 +440,11 @@ Image::resize(const Py::Tuple& args, const Py::Dict& kwargs)
 
     case NEAREST:
     {
-        if (colsIn == numcols && rowsIn == numrows) {
-            memcpy(bufferOut, bufferIn, colsIn * rowsIn * 4);
-        } else {
-            typedef agg::span_image_filter_rgba_nn<img_accessor_type, interpolator_type> span_gen_type;
-            typedef agg::renderer_scanline_aa<renderer_base, span_alloc_type, span_gen_type> renderer_type;
-            span_gen_type sg(ia, interpolator);
-            renderer_type ri(rb, sa, sg);
-            agg::render_scanlines(ras, sl, ri);
-        }
+        typedef agg::span_image_filter_rgba_nn<img_accessor_type, interpolator_type> span_gen_type;
+        typedef agg::renderer_scanline_aa<renderer_base, span_alloc_type, span_gen_type> renderer_type;
+        span_gen_type sg(ia, interpolator);
+        renderer_type ri(rb, sa, sg);
+        agg::render_scanlines(ras, sl, ri);
     }
     break;