diff --git a/algorithms/include/gdx/algo/rasterize.h b/algorithms/include/gdx/algo/rasterize.h index ba7c4cc..6b1c4fa 100644 --- a/algorithms/include/gdx/algo/rasterize.h +++ b/algorithms/include/gdx/algo/rasterize.h @@ -11,8 +11,6 @@ namespace gdx { -namespace gdal = inf::gdal; - template struct RasterizeOptions { @@ -39,14 +37,14 @@ RasterType translate(const RasterType& ras, const TranslateOptions& opt { auto& meta = ras.metadata(); - auto memDriver = gdal::RasterDriver::create(gdal::RasterType::Memory); - gdal::RasterDataSet memDataSet(memDriver.create_dataset(meta.rows, meta.cols, 0)); + auto memDriver = inf::gdal::RasterDriver::create(inf::gdal::RasterType::Memory); + inf::gdal::RasterDataSet memDataSet(memDriver.create_dataset(meta.rows, meta.cols, 0)); memDataSet.add_band(ras.data()); memDataSet.set_geotransform(inf::metadata_to_geo_transform(meta)); memDataSet.set_nodata_value(1, meta.nodata); memDataSet.set_projection(meta.projection); - auto dataPair = gdal::translate(memDataSet, options.meta); + auto dataPair = inf::gdal::translate(memDataSet, options.meta); return RasterType(dataPair.first, dataPair.second); } @@ -90,14 +88,14 @@ RasterType rasterize(const inf::gdal::VectorDataSet& shapeDataSet, const Rasteri gdalOpts.push_back(options.values[i]); } - auto datasetDataPair = gdal::rasterize(shapeDataSet, options.meta, gdalOpts); + auto datasetDataPair = inf::gdal::rasterize(shapeDataSet, options.meta, gdalOpts); return RasterType(datasetDataPair.first, datasetDataPair.second); } template RasterType rasterize(const fs::path& shapePath, const RasterizeOptions& options) { - return rasterize(gdal::VectorDataSet::open(shapePath), options); + return rasterize(inf::gdal::VectorDataSet::open(shapePath), options); } struct RasterizePolygonOptions @@ -139,7 +137,7 @@ RasterType rasterize_polygons(inf::gdal::VectorDataSet& vectorDs, const Rasteriz template RasterType rasterize_polygons(const fs::path& vector, const RasterizePolygonOptions& options) { - auto ds = gdal::VectorDataSet::open(vector); + auto ds = inf::gdal::VectorDataSet::open(vector); return rasterize_polygons(ds, options); } diff --git a/deps/vcpkg b/deps/vcpkg index b1859b8..2629782 160000 --- a/deps/vcpkg +++ b/deps/vcpkg @@ -1 +1 @@ -Subproject commit b1859b8212699da85c7981c345eb8ecc7129f4f7 +Subproject commit 26297829daa0663157e05a9038e689067cd7e887