matplotlib
diff --git a/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+1-1Lines changed: 1 addition & 1 deletion b/‎.travis.yml
Copy file name to clipboardExpand all lines: .travis.yml
+1-1Lines changed: 1 addition & 1 deletion
diff --git a/‎doc/users/whats_new.rst
Copy file name to clipboardExpand all lines: doc/users/whats_new.rst
+6Lines changed: 6 additions & 0 deletions b/‎doc/users/whats_new.rst
Copy file name to clipboardExpand all lines: doc/users/whats_new.rst
+6Lines changed: 6 additions & 0 deletions
diff --git a/‎lib/matplotlib/image.py
Copy file name to clipboardExpand all lines: lib/matplotlib/image.py
+2-2Lines changed: 2 additions & 2 deletions b/‎lib/matplotlib/image.py
Copy file name to clipboardExpand all lines: lib/matplotlib/image.py
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎lib/matplotlib/tests/baseline_images/test_image/image_composite_background.pdf
Copy file name to clipboard
87.4 KB b/‎lib/matplotlib/tests/baseline_images/test_image/image_composite_background.pdf
Copy file name to clipboard
87.4 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_image/image_composite_background.png
Copy file name to clipboard
30.4 KB b/‎lib/matplotlib/tests/baseline_images/test_image/image_composite_background.png
Copy file name to clipboard
30.4 KB
diff --git a/‎lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg
+272Lines changed: 272 additions & 0 deletions b/‎lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/baseline_images/test_image/image_composite_background.svg
+272Lines changed: 272 additions & 0 deletions
diff --git a/‎lib/matplotlib/tests/test_image.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_image.py
+9Lines changed: 9 additions & 0 deletions b/‎lib/matplotlib/tests/test_image.py
Copy file name to clipboardExpand all lines: lib/matplotlib/tests/test_image.py
+9Lines changed: 9 additions & 0 deletions
diff --git a/‎src/_image.cpp
Copy file name to clipboardExpand all lines: src/_image.cpp
+1-1Lines changed: 1 addition & 1 deletion b/‎src/_image.cpp
Copy file name to clipboardExpand all lines: src/_image.cpp
+1-1Lines changed: 1 addition & 1 deletion
@@ -17,7 +17,7 @@ install:
   - 'if [ $TRAVIS_PYTHON_VERSION == "3.2" ]; then pip install https://github.com/y-p/numpy/archive/1.6.2_with_travis_fix.tar.gz; fi'
   - 'if [ ${TRAVIS_PYTHON_VERSION:0:1} == "2" ]; then pip install numpy; fi' # should be nop if pre-installed
   - if [[ $TRAVIS_PYTHON_VERSION == '2.'* ]]; then pip install --use-mirrors PIL; fi
-  - sudo apt-get install inkscape
+  - sudo apt-get update && sudo apt-get install inkscape
   - python setup.py install
 
 script:
 
@@ -122,6 +122,12 @@ The individual items of a collection may now have different alpha
 values and be rendered correctly.  This also fixes a bug where
 collections were always filled in the PDF backend.
 
+Multiple images on same axes are correctly transparent
+------------------------------------------------------
+
+When putting multiple images onto the same axes, the background color
+of the axes will now show through correctly.
+
 .. _whats-new-1-2:
 
 new in matplotlib-1.2
 
@@ -315,7 +315,7 @@ def _draw_unsampled_image(self, renderer, gc):
 
         fc = self.axes.patch.get_facecolor()
         bg = mcolors.colorConverter.to_rgba(fc, 0)
-        im.set_bg( *bg)
+        im.set_bg(*bg)
 
         # image input dimensions
         im.reset_matrix()
@@ -1078,7 +1078,7 @@ def get_window_extent(self, renderer=None):
 
     def contains(self, mouseevent):
         """Test whether the mouse event occured within the image."""
-        if callable(self._contains): 
+        if callable(self._contains):
             return self._contains(self, mouseevent)
 
         if not self.get_visible():# or self.get_figure()._renderer is None:
 
@@ -225,6 +225,15 @@ def test_image_edges():
 
     assert g != 100, 'Expected a non-green edge - but sadly, it was.'
 
+@image_comparison(baseline_images=['image_composite_background'], remove_text=True)
+def test_image_composite_background():
+    fig = plt.figure()
+    ax = fig.add_subplot(111)
+    arr = np.arange(12).reshape(4, 3)
+    ax.imshow(arr, extent=[0, 2, 15, 0])
+    ax.imshow(arr, extent=[4, 6, 15, 0])
+    ax.set_axis_bgcolor((1, 0, 0, 0.5))
+    ax.set_xlim([0, 12])
 
 if __name__=='__main__':
     import nose
 
@@ -816,7 +816,7 @@ _image_module::from_images(const Py::Tuple& args)
     pixfmt pixf(*imo->rbufOut);
     renderer_base rb(pixf);
 
-    rb.clear(agg::rgba(1, 1, 1, 1));
+    rb.clear(agg::rgba(0, 0, 0, 0));
     for (size_t imnum = 0; imnum < N; imnum++)
     {
         tup = Py::Tuple(tups[imnum]);
Original file line number	Diff line number	Diff line change
`@@ -816,7 +816,7 @@ _image_module::from_images(const Py::Tuple& args)`
`816`	`816`	`pixfmt pixf(*imo->rbufOut);`
`817`	`817`	`renderer_base rb(pixf);`
`818`	`818`
`819`		`- rb.clear(agg::rgba(1, 1, 1, 1));`
	`819`	`+ rb.clear(agg::rgba(0, 0, 0, 0));`
`820`	`820`	`for (size_t imnum = 0; imnum < N; imnum++)`
`821`	`821`	`{`
`822`	`822`	`tup = Py::Tuple(tups[imnum]);`