Feb 18, 2016 · Dec 22, 2015 · Dec 22, 2015 · Dec 22, 2015 · Dec 22, 2015 · Dec 22, 2015
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
            out_height = int(out_height_base)

        if not unsampled:
            iflen(A.shape) == 2:
            ifA.ndim == 2:
                A = self.norm(A)
                if A.dtype.kind == 'f':
                    # For floating-point greyscale images, we treat negative
                    # numbers as transparent.

                    # TODO: Use np.full when we support Numpy 1.9 as a
                    # minimum
                    output = np.empty((out_height, out_width), dtype=A.dtype)
                    output[...] = -100.0
                else:
                    output = np.zeros((out_height, out_width), dtype=A.dtype)

                alpha = 1.0
            eliflen(A.shape) == 3:
            elifA.ndim == 3:
                # Always convert to RGBA, even if only RGB input
                if A.shape[2] == 3:
                    A = _rgb_to_rgba(A)
            output = self.to_rgba(output, bytes=True, norm=False)

            # Apply alpha *after* if the input was greyscale
            iflen(A.shape) == 2:
            ifA.ndim == 2:
                alpha = self.get_alpha()
                if alpha is not None and alpha != 1.0:
                    alpha_channel = output[:, :, 3]
            raise RuntimeError('You must first set the image array')

        A = self._A
        iflen(A.shape) == 2:
        ifA.ndim == 2:
            if A.dtype != np.uint8:
                A = self.to_rgba(A, bytes=True)
                self.is_grayscale = self.cmap.is_gray()
        if len(x.shape) != 1 or len(y.shape) != 1\
           or A.shape[0:2] != (y.shape[0], x.shape[0]):
            raise TypeError("Axes don't match array shape")
        iflen(A.shape) not in [2, 3]:
        ifA.ndim not in [2, 3]:
            raise TypeError("Can only plot 2D or 3D data")
        iflen(A.shape) == 3 and A.shape[2] not in [1, 3, 4]:
        ifA.ndim == 3 and A.shape[2] not in [1, 3, 4]:
            raise TypeError("3D arrays must have three (RGB) "
                            "or four (RGBA) color components")
        iflen(A.shape) == 3 and A.shape[2] == 1:
        ifA.ndim == 3 and A.shape[2] == 1:
            A.shape = A.shape[0:2]
        self._A = A
        self._Ax = x
Original file line number	Diff line number	Diff line change
Expand Up		@@ -306,18 +306,21 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
		out_height = int(out_height_base)

		if not unsampled:
		iflen(A.shape) == 2:
		ifA.ndim == 2:
		A = self.norm(A)
		if A.dtype.kind == 'f':
		# For floating-point greyscale images, we treat negative
		# numbers as transparent.

		# TODO: Use np.full when we support Numpy 1.9 as a
		# minimum
		output = np.empty((out_height, out_width), dtype=A.dtype)
		output[...] = -100.0
Copy link Member WeatherGodJan 6, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Perhaps add a TODO here to update this with`np.full` at some point. Unfortunately, the numpy docs doesn't say when it was added... Copy link Member QuLogicJan 6, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. 1.9, I believe. Copy link MemberAuthor mdboomJan 7, 2016 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Good point. Added.
		else:
		output = np.zeros((out_height, out_width), dtype=A.dtype)

		alpha = 1.0
		eliflen(A.shape) == 3:
		elifA.ndim == 3:
		# Always convert to RGBA, even if only RGB input
		if A.shape[2] == 3:
		A = _rgb_to_rgba(A)
Expand All		@@ -340,7 +343,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
		output = self.to_rgba(output, bytes=True, norm=False)

		# Apply alpha after if the input was greyscale
		iflen(A.shape) == 2:
		ifA.ndim == 2:
		alpha = self.get_alpha()
		if alpha is not None and alpha != 1.0:
		alpha_channel = output[:, :, 3]
Expand DownExpand Up		@@ -715,7 +718,7 @@ def make_image(self, renderer, magnification=1.0):
		raise RuntimeError('You must first set the image array')

		A = self._A
		iflen(A.shape) == 2:
		ifA.ndim == 2:
		if A.dtype != np.uint8:
		A = self.to_rgba(A, bytes=True)
		self.is_grayscale = self.cmap.is_gray()
Expand DownExpand Up		@@ -763,12 +766,12 @@ def set_data(self, x, y, A):
		if len(x.shape) != 1 or len(y.shape) != 1\
		or A.shape[0:2] != (y.shape[0], x.shape[0]):
		raise TypeError("Axes don't match array shape")
		iflen(A.shape) not in [2, 3]:
		ifA.ndim not in [2, 3]:
		raise TypeError("Can only plot 2D or 3D data")
		iflen(A.shape) == 3 and A.shape[2] not in [1, 3, 4]:
		ifA.ndim == 3 and A.shape[2] not in [1, 3, 4]:
		raise TypeError("3D arrays must have three (RGB) "
		"or four (RGBA) color components")
		iflen(A.shape) == 3 and A.shape[2] == 1:
		ifA.ndim == 3 and A.shape[2] == 1:
		A.shape = A.shape[0:2]
		self._A = A
		self._Ax = x
Expand Down