latest from coda-oss

mdaus · Jun 13, 2023 · 18be358 · 18be358
1 parent 471fb3f
commit 18be358
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git 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
@@ -36,6 +36,7 @@
 #include <sio/lite/FileHeader.h>
 #include <sio/lite/ElementType.h>
 #include <sys/filesystem.h>
+#include <sys/Span.h>
 
 namespace sio
 {
@@ -70,7 +71,7 @@ void readSIO(const std::string& pathname,
     reader.read(image.get(), numPixels * sizeof(InputT), true);
 }
 template <typename InputT>
-void readSIO(const sys::filesystem::path& pathname,
+void readSIO(const coda_oss::filesystem::path& pathname,
              types::RowCol<size_t>& dims,
              std::vector<InputT>& image)
 {
@@ -86,7 +87,7 @@ void readSIO(const sys::filesystem::path& pathname,
     }
 
     image.resize(dims.area());
-    reader.read(coda_oss::span<InputT>(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
@@ -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