From 14ed83601539a596eaf0e7b98e1a5bd531e0e14f Mon Sep 17 00:00:00 2001 From: Dirk Vanden Boer Date: Thu, 29 Aug 2024 15:28:01 +0200 Subject: [PATCH] Support compilation agains gdal 3.9.x --- python/pythonalgoadapters.cpp | 2 ++ python/pythonioadapters.cpp | 40 ++++++++++++++++++----------------- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/python/pythonalgoadapters.cpp b/python/pythonalgoadapters.cpp index e0206a3..e52896d 100644 --- a/python/pythonalgoadapters.cpp +++ b/python/pythonalgoadapters.cpp @@ -36,6 +36,8 @@ namespace pyalgo { namespace py = pybind11; using namespace inf; +namespace gdal = inf::gdal; + template using value_type = typename std::remove_cv_t>::value_type; diff --git a/python/pythonioadapters.cpp b/python/pythonioadapters.cpp index ecd0f5e..510e3c7 100644 --- a/python/pythonioadapters.cpp +++ b/python/pythonioadapters.cpp @@ -29,6 +29,8 @@ namespace gdx { namespace py = pybind11; using namespace py::literals; +namespace gdal = inf::gdal; + template using EigenArray = Eigen::Array; @@ -157,30 +159,30 @@ static void writeArray(py::array data, const RasterMetadata& meta, py::object pa void initIoModule(py::GDX_PYBIND_MODULE& ioMod) { ioMod.def("read_metadata", - &read_metadata, - "raster_path"_a, - "Read the metadata from a raster on disk, returns the gdx.raster_metadata instance"); + &read_metadata, + "raster_path"_a, + "Read the metadata from a raster on disk, returns the gdx.raster_metadata instance"); ioMod.def("read_array", - &readArray, - "raster_path"_a, - "dtype"_a = py::none(), - "extent"_a = py::none(), - "Read a raster from disk, returns a (gdx.raster_metadata, np.ndarray) tuple"); + &readArray, + "raster_path"_a, + "dtype"_a = py::none(), + "extent"_a = py::none(), + "Read a raster from disk, returns a (gdx.raster_metadata, np.ndarray) tuple"); ioMod.def("read_maskedarray", - &readMaskedArray, - "raster_path"_a, - "dtype"_a = py::none(), - "extent"_a = py::none(), - "Read a raster from disk, returns a (gdx.raster_metadata, np.ma.MaskedArray) tuple"); + &readMaskedArray, + "raster_path"_a, + "dtype"_a = py::none(), + "extent"_a = py::none(), + "Read a raster from disk, returns a (gdx.raster_metadata, np.ma.MaskedArray) tuple"); ioMod.def("write_array", - &writeArray, - "data"_a, - "metadata"_a, - "raster_path"_a, - "dtype"_a = py::none(), - "Write a numpy array to disk"); + &writeArray, + "data"_a, + "metadata"_a, + "raster_path"_a, + "dtype"_a = py::none(), + "Write a numpy array to disk"); } }