Merge pull request matplotlib#26275 from ianthomas23/pybind11_image2

Use pybind11 in image module

Author: ksunden

lib/matplotlib/tests/test_image.py

@@ -1468,17 +1468,26 @@ def test_str_norms(fig_test, fig_ref):
 
 def test__resample_valid_output():
     resample = functools.partial(mpl._image.resample, transform=Affine2D())
-    with pytest.raises(ValueError, match="must be a NumPy array"):
+    with pytest.raises(TypeError, match="incompatible function arguments"):
         resample(np.zeros((9, 9)), None)
     with pytest.raises(ValueError, match="different dimensionalities"):
         resample(np.zeros((9, 9)), np.zeros((9, 9, 4)))
-    with pytest.raises(ValueError, match="must be RGBA"):
+    with pytest.raises(ValueError, match="different dimensionalities"):
+        resample(np.zeros((9, 9, 4)), np.zeros((9, 9)))
+    with pytest.raises(ValueError, match="3D input array must be RGBA"):
+        resample(np.zeros((9, 9, 3)), np.zeros((9, 9, 4)))
+    with pytest.raises(ValueError, match="3D output array must be RGBA"):
         resample(np.zeros((9, 9, 4)), np.zeros((9, 9, 3)))
-    with pytest.raises(ValueError, match="Mismatched types"):
+    with pytest.raises(ValueError, match="mismatched types"):
         resample(np.zeros((9, 9), np.uint8), np.zeros((9, 9)))
     with pytest.raises(ValueError, match="must be C-contiguous"):
         resample(np.zeros((9, 9)), np.zeros((9, 9)).T)
 
+    out = np.zeros((9, 9))
+    out.flags.writeable = False
+    with pytest.raises(ValueError, match="Output array must be writeable"):
+        resample(np.zeros((9, 9)), out)
+
 
 def test_axesimage_get_shape():
     # generate dummy image to test get_shape method

setupext.py

@@ -424,12 +424,13 @@ def get_extensions(self):
         add_libagg_flags(ext)
         yield ext
         # image
-        ext = Extension(
+        ext = Pybind11Extension(
             "matplotlib._image", [
                 "src/_image_wrapper.cpp",
-                "src/py_converters.cpp",
-            ])
-        add_numpy_flags(ext)
+                "src/py_converters_11.cpp",
+            ],
+            cxx_std=11)
+        # Only need source code files agg_image_filters.cpp and agg_trans_affine.cpp
         add_libagg_flags_and_sources(ext)
         yield ext
         # path

src/_image_resample.h

@@ -496,7 +496,6 @@ typedef enum {
     SINC,
     LANCZOS,
     BLACKMAN,
-    _n_interpolation
 } interpolation_e;
 
 
@@ -629,7 +628,6 @@ static void get_filter(const resample_params_t &params,
 {
     switch (params.interpolation) {
     case NEAREST:
-    case _n_interpolation:
         // Never should get here.  Here to silence compiler warnings.
         break;