Support 16-bit grayscale

mdboom · mdboom · commit 7cccfb3273f2 · 2016-02-17T09:47:55.000-05:00
diff --git a/src/_image_resample.h b/src/_image_resample.h
@@ -647,6 +647,34 @@ template <> class type_mapping<float>
 };
 
 
+template <> class type_mapping<unsigned short>
+{
+ public:
+    typedef agg::gray16 color_type;
+    typedef agg::blender_gray<color_type> blender_type;
+    typedef agg::pixfmt_alpha_blend_gray<blender_type, agg::rendering_buffer> pixfmt_type;
+    typedef pixfmt_type pixfmt_pre_type;
+
+    template <typename A>
+    struct span_gen_affine_type
+    {
+        typedef agg::span_image_resample_gray_affine<A> type;
+    };
+
+    template <typename A, typename B>
+    struct span_gen_filter_type
+    {
+        typedef agg::span_image_filter_gray<A, B> type;
+    };
+
+    template <typename A, typename B>
+    struct span_gen_nn_type
+    {
+        typedef agg::span_image_filter_gray_nn<A, B> type;
+    };
+};
+
+
 template <> class type_mapping<unsigned char>
 {
  public:
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -303,6 +303,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(
+                (unsigned short *)PyArray_DATA(input_array),
+                PyArray_DIM(input_array, 1),
+                PyArray_DIM(input_array, 0),
+                (unsigned short *)PyArray_DATA(output_array),
+                PyArray_DIM(output_array, 1),
+                PyArray_DIM(output_array, 0),
+                params);
+            Py_END_ALLOW_THREADS
+            break;
         default:
             PyErr_SetString(PyExc_ValueError, "Unsupported dtype");
             goto error;
