From 18be3582a913519ac9b1e77074beb0c988a618c8 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Tue, 13 Jun 2023 17:30:21 -0400 Subject: [PATCH] latest from coda-oss --- externals/coda-oss/modules/c++/sio.lite/CMakeLists.txt | 2 +- .../modules/c++/sio.lite/include/sio/lite/ReadUtils.h | 5 +++-- externals/coda-oss/modules/c++/sio.lite/wscript | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/externals/coda-oss/modules/c++/sio.lite/CMakeLists.txt b/externals/coda-oss/modules/c++/sio.lite/CMakeLists.txt index da07b2828..5f2a9e96b 100644 --- a/externals/coda-oss/modules/c++/sio.lite/CMakeLists.txt +++ b/externals/coda-oss/modules/c++/sio.lite/CMakeLists.txt @@ -3,7 +3,7 @@ set(MODULE_NAME sio.lite) coda_add_module( ${MODULE_NAME} VERSION 1.0 - DEPS io-c++ types-c++) + DEPS sys-c++ io-c++ types-c++) coda_add_tests( MODULE_NAME ${MODULE_NAME} diff --git a/externals/coda-oss/modules/c++/sio.lite/include/sio/lite/ReadUtils.h b/externals/coda-oss/modules/c++/sio.lite/include/sio/lite/ReadUtils.h index 358e1ae9e..abdab3a03 100644 --- a/externals/coda-oss/modules/c++/sio.lite/include/sio/lite/ReadUtils.h +++ b/externals/coda-oss/modules/c++/sio.lite/include/sio/lite/ReadUtils.h @@ -36,6 +36,7 @@ #include #include #include +#include namespace sio { @@ -70,7 +71,7 @@ void readSIO(const std::string& pathname, reader.read(image.get(), numPixels * sizeof(InputT), true); } template -void readSIO(const sys::filesystem::path& pathname, +void readSIO(const coda_oss::filesystem::path& pathname, types::RowCol& dims, std::vector& image) { @@ -86,7 +87,7 @@ void readSIO(const sys::filesystem::path& pathname, } image.resize(dims.area()); - reader.read(coda_oss::span(image.data(), image.size()), true /*verifyFullRead*/); + reader.read(sys::make_span(image), true /*verifyFullRead*/); } /* diff --git a/externals/coda-oss/modules/c++/sio.lite/wscript b/externals/coda-oss/modules/c++/sio.lite/wscript index 5a2a1d10d..b2814566f 100644 --- a/externals/coda-oss/modules/c++/sio.lite/wscript +++ b/externals/coda-oss/modules/c++/sio.lite/wscript @@ -1,6 +1,6 @@ NAME = 'sio.lite' VERSION = '1.0' -MODULE_DEPS = 'io types' +MODULE_DEPS = 'sys io types' options = configure = distclean = lambda p: None