Fix image_masked.py example

Author: mdboom

lib/matplotlib/image.py

@@ -365,7 +365,7 @@ def _make_image(self, A, in_bbox, out_bbox, clip_bbox, magnification=1.0,
                 if A.dtype.kind == 'f':
                     rgba[..., 3] = ~A.mask
                 else:
-                    rgba[..., 3] = np.where(A.mask, 0, np.iinfo(np.dtype).max)
+                    rgba[..., 3] = np.where(A.mask, 0, np.iinfo(A.dtype).max)
                 A = rgba
                 output = np.zeros((out_height, out_width, 4), dtype=A.dtype)
                 alpha = 1.0

src/_image_resample.h

@@ -533,6 +533,35 @@ template <> class type_mapping<agg::rgba8>
 };
 
 
+template <> class type_mapping<agg::rgba16>
+{
+ public:
+    typedef agg::rgba16 color_type;
+    typedef fixed_blender_rgba_plain<color_type, agg::order_rgba> blender_type;
+    typedef fixed_blender_rgba_pre<color_type, agg::order_rgba> pre_blender_type;
+    typedef agg::pixfmt_alpha_blend_rgba<blender_type, agg::rendering_buffer> pixfmt_type;
+    typedef agg::pixfmt_alpha_blend_rgba<pre_blender_type, agg::rendering_buffer> pixfmt_pre_type;
+
+    template <typename A>
+    struct span_gen_affine_type
+    {
+        typedef agg::span_image_resample_rgba_affine<A> type;
+    };
+
+    template <typename A, typename B>
+    struct span_gen_filter_type
+    {
+        typedef agg::span_image_filter_rgba<A, B> type;
+    };
+
+    template <typename A, typename B>
+    struct span_gen_nn_type
+    {
+        typedef agg::span_image_filter_rgba_nn<A, B> type;
+    };
+};
+
+
 template <> class type_mapping<agg::rgba32>
 {
  public:

src/_image_wrapper.cpp

@@ -226,6 +226,19 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
                     params);
                 Py_END_ALLOW_THREADS
                 break;
+            case NPY_UINT16:
+            case NPY_INT16:
+                Py_BEGIN_ALLOW_THREADS
+                resample(
+                    (agg::rgba16 *)PyArray_DATA(input_array),
+                    PyArray_DIM(input_array, 1),
+                    PyArray_DIM(input_array, 0),
+                    (agg::rgba16 *)PyArray_DATA(output_array),
+                    PyArray_DIM(output_array, 1),
+                    PyArray_DIM(output_array, 0),
+                    params);
+                Py_END_ALLOW_THREADS
+                break;
             case NPY_FLOAT32:
                 Py_BEGIN_ALLOW_THREADS
                 resample(
@@ -254,13 +267,13 @@ image_resample(PyObject *self, PyObject* args, PyObject *kwargs)
                 PyErr_SetString(
                     PyExc_ValueError,
                     "3-dimensional arrays must be of dtype unsigned byte, "
-                    "float32 or float64");
+                    "unsigned short, float32 or float64");
                 goto error;
             }
         } else {
             PyErr_Format(
                 PyExc_ValueError,
-                "If 3-dimensional, array must be RGBA.  Got %d.",
+                "If 3-dimensional, array must be RGBA.  Got %d planes.",
                 PyArray_DIM(input_array, 2));
             goto error;
         }