From fe0e5584f72947c35711ffcf5916337f8de60826 Mon Sep 17 00:00:00 2001
From: "J. Daniel Smith" <dan.smith@maxar.com>
Date: Mon, 5 Jun 2023 14:03:33 -0400
Subject: [PATCH] CODA-OSS 2023-06-05 and NITRO-2.11.3 (#654)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* copy_externals.csh

* copy_externals.csh

* copy_externals.csh

* Squashed 'externals/coda-oss/' changes from 67d6362bc..cbfb20ce2

cbfb20ce2 update release notes for C++11/master release (#658)
4bdaf10d9 Change xml lite function to virtual (#645)
6be8f0a2e move debug -g flags to be turned on only if debugging (#644)
e1b0fa349 commit (but not build) HDF5 source code (#634)
1ac97fe48 add HDF5 source code (not built) (#612)
fde6c864f Merge pull request #607 from mdaus/bugfix/change-order-of-config-header-install
c8a004401 Install the cmake-configured header after installing the xercesc source tree. Otherwise, the original config will persist in the install
dda2c9acd Merge pull request #606 from mdaus/fix-xerces-config
004a00f09 Bump zlib version for conan builds
207f4dbb9 Fix Xerces config issue and install its config.h
b84241767 Add support for debug optimizations.
0f6cda57d Use enhanced debug information with gcc/gdb.
5047dce1a Work around GCC avx support bug.
001ab1875 Rebuild the waf self-extractor with a fix for the FIPS error.
5a7f64fca Revert "Rebuild the waf self-extractor with a fix for the FIPS problem."
9f6f775f8 Rebuild the waf self-extractor with a fix for the FIPS problem.
963e8ff40 Revert "add HDF5 source code (#603)"
ec7bb2e52 add HDF5 source code (#603)
6f41c09d7 Release 2022-08-30 (#596)
f91668012 Added handler accessor to MinidomParser for inheriting modules (#594)
72d29e9c2 get unittests working when "nested" in other projects (#595)
f8f18fea5 Actually look at unit test results when using waf (#593)
cda679cee more overloads to take a string length (#592)
b95a32bc4 by default, Uri()s aren't validated (#591)
173930a6f fix a UTF-8 conversion bug (#590)
c5c221a83 CODA code inherits from xml.lite classes :-( (#589)
a4c6294c3 use EncodedStringView instead of _bstr_t (#588)
83c982f0c remove work-arounds to write non-UTF-8 XML (#586)
ebf6db176 <bit> is part of C++20
d3aa8aa5c std::u8string is in C++20, not C++17
03654933c changes to math.linear from coda (#587)
5a2f8e52f release 2022-08-02 (#585)
e5516aba2 tweak names to match utf8:: conventions (#584)
3083ec791 move most platform-specific code to EncodedStringView (#583)
36371410c EncodedString tweaks for XML processing (#582)
cf2016205 remove any vestiges of Expat and libXML (#580)
33538aa0f update for newer Intel compiler
ed65e4ccc Add two patch candidates to fix FIPS problems in waf.
a731ebf8e release 2022-06-29 (#579)
59387bd87 update "ReleaseNotes.md" for recent changes (#578)
e4f940854 remove "boost" and "serialize" (#577)
80b70537e update to zlib-1.2.12 (#576)
202084bac Remove some compiler warnings (#575)
c61232224 build most code with Visual Studio (#574)
6e4d952be some unit-tests need argc/argv (#573)
36e051d7b Add run1D method to GenerationThreadPool (#572)
0a08b8e4e build "coda-oss-lite" as a VS2022 project (#571)
6677cc38e simplify creation of encodes string (#570)
ba62c610c Add the 'universal_newlines=True' flag to python Popen calls.
984e4a96c Fix a bug in waf platform detection.
d2aca8d4b release 2022-05-03 (#569)
ff55fed59 can't replace all TEST_ASSERT macros with functions (#568)
89a636a6a fix copy/assignment in EncodedString (#567)
c3fe91d42 latest tweaks to build with C++17 (#566)
a59a51b57 be sure we use a 64-bit time_t (#565)
1f79fb3dd Poly2D::atY() bugfix (#564)
ac5307662 Testing to see if windows-2019 works with github actions (#563)
8d0726b37 Fix a bug in waf platform detection.
c662b5aac Update ReleaseNotes.md
ef4a3bbd9 Release 2022-02-22 (aka 2/22/22) (#562)
0a0e6cf14 use char16_t on Linux (#560)
fe65bfddf fix units for ICC, sys::filesystem (#559)
def979170 update to GSL 4.0.0 (#558)
fe365e5a4 fix XML validation for UTF-8 (#557)
502e5829b support conversion to std::wstring (#556)
e69422596 Delete codeql-analysis.yml
45bc6a964 Create codeql-analysis.yml
87d9a7ef5 remove CodeQL
eab5ecb89 Update build_unittest.yml
8ab12d47e Delete codeql-analysis.yml
9e542092b try running CodeQL as part of build-linux-cmake
de0c50651 Create codeql-analysis.yml
049608782 tweaks to build in "coda" (#554)
0ba24233b replace sys::U8string with coda_oss::u8string (#553)
bcee6551f add EncodedString class (#552)
c2eecd392 simplify implementation of EncodedStringView (#551)
c1320ef00 fix 'typename' for other compilers (#550)
ac3b93931 tweaks to make "main" build easier (#549)
78da741cf remove sys/Optional.h (#548)
f31730ac7 put our std work-arounds in one place (#547)
9b7bb571a Add an EncodedStringView class (#545)
c0e1da520 another batch of tweaks to cleanup compiler warnings, etc. (#546)
0f3bfd9d0 added missing "virtual", support unique_ptr (#544)
ca32f99c0 Add option to specify curl installation location. (#501)
2df9c1a81 allow std::filesystem::path to be used for validation (#543)
289143576 add SinCos for units::Angle (#542)
e430eddef Delete log4j as 1) it's old, 2) coda-oss doesn't use it, and 3) remove any questions about security vulnerability (#541)
bb11134fd xml.lite tweaks (#540)
955b33e21 Release 2021_12_13 (#539)
d73d74d5c xml.lite tweaks (#537)
3a90e25c6 use more C++11 functionality (#538)
9ca2a0e50 remove more compiler warnings (#536)
0ec9da1e9 be sure == and != are in-sync (#535)
9084be32c fix size_t compiler warnings (#534)
abd6469ec fix ICC errors (#533)
09cb36fff update version number before cutting a new release (#532)
c29e4d298 fix ICC warnings/errors from high-side (#531)
91f8f1c08 simplify our std:: implementations (#530)
7c633c7bb Further reduce use of std::auto_ptr (#529)
d85883749 Provide support for creating simple version numbers (#528)
b03582592 Merge pull request #527 from mdaus/fix-crypt-h-clash
ffed3d633 Disable encryption support in minizip build and remove crypt.h header
ee2b2bf8c Merge pull request #525 from mdaus/swig-fix
3c02ff289 Fix config-python prefix issue
6149053d4 Add new config-python module for SWIG compatibility workarounds
30acf5b9a mt::transform_async(), mem::SharedPtr, math::SinCos() (#526)
21efd6a6c Implement better workaround for lack of SWIG support for "final"
60837a62e Revert unneeded changes
0bc994dea Fix SWIG path issue for waf build
070f4e915 Update SWIG generated files
f8472b0c4 Fix SWIG path issues and warnings
e10707f75 Set minimum SWIG version to 4.0.1
b8cdba5c7 Fix waf SWIG build issue
2bd0ee39e Enable SWIG in Github waf build
f2b001146 Try fixing SWIG compile issue again
afafabcc2 Fix SWIG compile issue on Linux due to missing macro
7c8d4a81d Add SWIG to the CI flow
4023d721c Regenerate SWIG bindings
1d8c70109 Add some compile definitions needed by SWIG for CMake build
e5cc58545 Remove some functions which return unique_ptr from SWIG bindings (incompatible).
965a2913d Remove "final" specifier from structs bound in SWIG (incompatible)
f1bec5601 Merge branch 'master' of https://github.com/mdaus/coda-oss
c01c4d7de do in-line initialization (#524)
fb7230ea1 Update CMakeLists.txt
5dfb05689 tweaks for C++17 (#523)
1a7d3ab52 Merge pull request #515 from mdaus/security-and-conan-updates
d13885df6 make it easier to create a new Element with the right encoding (#522)
3fb09e73a Merge pull request #359 from mdaus/parseArgUpdate
0d546a8f1 Tweak some ArgumentParser tests for the ignoreUnknownArguments option
14bd1f26d Merge remote-tracking branch 'origin/master' into parseArgUpdate
cf398c0d3 tweak code for C++11/C++17 (#521)
2d0322b07 reduce use of std::auto_ptr (#520)
853320e90 reduce use of deprecated C++98 code (#519)
4752ba222 Replace some warning pragmas with macros
32685554f Merge remote-tracking branch 'origin/master' into security-and-conan-updates
f0350c0cf Merge pull request #518 from mdaus/bugfix/python3.9-related
fc01df0d8 fix typos in gcc macros
9d356f36c fix gcc impl
8124da763 remove unreachable code
d034b3a84 clobber warnings from numpy innards
9941a401e macros to disable warnings around system headers
8a725bb8f Merge pull request #516 from mdaus/mbraswell-enablecpp17-windows
2e7b8165a Fixed pragma stuff on gcc
9775bb02d Fixed pragma stuff on gcc
680d3cce4 Merge branch 'master' of https://github.com/mdaus/coda-oss
8ffd6ed79 forgot to add "units" to CMakeFiles.txt
06835676e Remove Auto_ptr flag and make disable warnings cross_platform compatible
d62efece5 Merge branch 'master' of https://github.com/mdaus/coda-oss into mbraswell-enablecpp17-windows
d04042ee9 Merge pull request #517 from mdaus/develop/compiler-warning-helpers
cf5cd16b3 Fix macro usage on gcc
a88bbcd20 Macros to narrowly target disabling warnings
c0d5cdf00 Formatting Changes
be019b44b Formatting Changes
2eb04dc9e Fixed compiler warnings and added option to compile cpp17 with waf on windows
5d9f27fae Refactor coda-oss conan recipe
ce6645714 Disable warning for MSVC2017 and earlier
ecfefbfbe Merge remote-tracking branch 'origin/master' into security-and-conan-updates
8b1479881 Merge pull request #514 from mdaus/develop/fix-unused-symbol-errors
1d9a4ec71 Add conan option to use std::regex instead of pcre
6dd5d4457 add required include
4c0ae7781 add required include
1873ceeb8 parameterize build (somewhat)
c9ef567a7 fix Release compile error
e6b47e94e fix compiler error
eff205ba2 helper macro to fix unusual targets
342098a32 Fix CMake build for modules without include files
5625706eb Enable cpp17 option for windows builds
98e12b138 Use consistent line endings for *.in template files
d01fea0b7 Configure coda_add_module to install more file extension types
30823f673 Delete stray file
ac7760ba2 Load dependency targets when loading coda-oss for conan build
14781cab8 Implement conan build for openjpeg and pcre2 dependencies
9d955efa5 Exclude unsupported XML backend wrappers from CMake build to remove warnings
1e8c9b264 Merge remote-tracking branch 'origin/master' into security-and-conan-updates
772d80495 Implement conan build for libjpeg dependency
98b653dea Implement conan build for xerces-c dependency
11323e8e9 Implement conan build for zlib dependency
d0e6bf2c4 Improve conan test_package
a03e1294e Fix uninitialized member variable warning in mt::AbstractTiedThreadPool
c7bb47b5f Remove member variable duplicated in derived class io::ToggleOutputStream
0838ac2ca Use consistent line endings for conan recipes and CMake files.
2768e5f07 Update libjpeg to v9d
d75f55bca Update zlib to 1.2.11
ca2f84cff Fix warning in GSL for MSVC 2015 and earlier
1babd19b5 Fix warning in thread tests for MSVC
2f1763249 Fix warning in except module for Visual Studio 2015 and earlier
a485bf6bb Fix BIGENDIAN redefinition warning
59543e42b Disable warning in dbi for MSVC 2017 and earlier
b4b212834 Fix warnings in numpyutils for MSVC 2017 and earlier
2b179b658 Fix integer overflow issue
898151ad7 Hook up simple "units" (#513)
4d6beeecc Merge pull request #511 from mdaus/develop/horizontal-improved-numerical-precision
c1878b228 Fix for numerical precision issues surrounding horizontal lines
7d1442c66 Merge pull request #510 from mbraswell/fix-testnumelements-build
58fc85f09 Whitespace change to trigger workflow
ab74026b9 Fix wscript to successfully build test_num_elements
323283cd7 Merge pull request #509 from mbraswell/develop-mbraswell-cpp17
16a550289 Added option to enable cpp17
b0625cf5a tweak debug stuff (#508)
845549487 fix RowCol casting (#507)
01fbb5f00 Get std::u8string working right with C++20 (#506)
df9413efa more "noexcept" for fewer code-analysis diagnostics (#505)
e6219f97f reduce compiler warnings/code-analysis diagnostics (#504)
4c9ea0ef1 tweaks for VS2019 16.10 (#503)
0d8ea070a reduce compiler warnings (#502)
625b8b59d reduce compiler warnings (#500)
3795758da get rid of more compiler warnings/code-analysis diagnostics (#499)
427f91be8 reduce compiler-warnings and code-analysis diagnostics (#498)
c82dd9e37 cleanup compiler and code-analysis diagnistics (#496)
b5105b54a reduce compiler warnings (#495)
e0099cc26 Develop/compiler optimizations (#494)
0eeb3f963 tweaks to python wrappers made in "nitro" (#492)
5f91f7060 fix printf() format string (#491)
55b855a86 Delete codeql-analysis.yml
603c192d3 Update codeql-analysis.yml
f306979e8 Update codeql-analysis.yml
4a1f78f8e Create codeql-analysis.yml
3c80a6568 add back coda_oss::filesystem::path (#490)
eaea659ed tweak how std:: features are exposed (#489)
0492f0d95 simplify code exposing std:: routines (#488)
e5f3d7770 remove code-analysis diagnostics (#485)
5be599e5a make HOME and USERPROFILE the same (#484)
62b22ae01 cleanup more compiler warnings (#483)
c32ec7dcc add unit-tests for env-var editing (#482)
311aea462 allow an environment-variable to be "edited" during expansion (#481)
bbcab1310 static_assert is C++11, don't use it when checking for C++11 (#480)
068562f58 fix glitches in expandEnviromentVariables() (#479)
30ed1d95e produce a new Path::expandEnviromentVariables() function (#478)
074a873b2 remove compiler warnings (#477)
e29f65479 latest C++17 tweaks (#476)
c4e681b0a tweak code when wchar_t is a built-in type (#474)
8449ac29a wchar_t might not be a built-in type on old systems (#473)
a62bdb3e6 add operator= to sys::Optional (#472)
8e310a776 use compiler-provided macros to determine features (#470)
88405c8ed "constexpr" can be hard to get right with older compilers; don't even try (#471)
b195ab3ef need at least VS2017 to use the real GSL (#469)
2978f9114 tweaks to build with older compilers (#468)
7235b898d The (old) version of SWIG we're using doesn't like certain C++11 features. (#464)
cccde7f12 only look in the Win1252->UTF-8 map as a last resort (#467)
3db09742c get rid of more compiler warnings (#465)
5e0d2e845 get rid of "char8_t" compiler warning (#463)
d710bc688 make getValue() easier to use (#462)
f5a928476 make getElement*() be consistent for both 0 and >1 (#461)
88be6dba3 consistently add C++14/17/20 library features (#459)
59c3a7e2e use coda_oss:: as a drop-in replacement for std:: (#458)
35de4524c use sys::Filesystem::path rather than std::string (#457)
cace66600 make sys::Filesystem::path better conform to std::filesystem::path (#456)
f395edc89 remove ambiguous overloads w/C++17 (#455)
eac4371f1 use newly added sys::Optional<> to manage "encoding" (#454)
243ef5e50 don't derive from std::iterator (#453)
a48b01141 Arguments should be "const&" to prevent C4866 (#452)
878bff901 provide std::span (#451)
81727c485 remove newly added a new pure virtual as that's a breaking change (#450)
93cf0f03e main -> master (#449)
5af37a736 be sure code compiles with C++17 (#448)
82b5aecfb build with C++17 (#407)
6ffb888d7 reduce compiler warnings (#439)
9137dda7d GSL (Guideline Support Library) from https://github.com/Microsoft/GSL (#423)
bc5552cd2 update to xerces-c-3.2.3 (#409)
6fe09e1db update to openjpeg-2.3.1 (#417)
6405c0ce5 reduce differences in #407 (#438)
2987bbf8d tweak how std::filesystem is enabled (#437)
8fd3c2f20 tweak how std::endian is enabled (#436)
138372c88 more straight-forward reduction of std::auto_ptr (#435)
f13c7cec8 straight-forward reduction of std::auto_ptr (#434)
d243b08e1 add mem::auto_ptr for transition to C++17 (#432)
54ed52158 allow clients to specify custom toType and toString (#431)
7f90aab25 remove trailing underscore from macro (#429)
999e49068 with C++11, several sys typedefs are the same on both Windows & *nix (#427)
6f075b1be add sys::Byte (#426)
92221bd0d allow except::Throwable to derive from std::exception (#421)
a8f52d0ad reduce compiler warnings (#424)
63ea20af6 #including <bit> w/C++17 generates warnings (#408)
10ef06031 reduce compiler warnings (#405)
cf233fdcf forgot Conf.cpp changes for sys::Endian (#403)
cc53b1853 fix several compiler warnings/code-analysis diagnostics (#404)
1db3751a3 implmeent sys::Endian from C++20 (#402)
f042cd6bb support std::filesystem if desired (#400)
4895a9f2d WIN32 is old, but existing code might still use it; _WIN32 is better (#398)
e2a62f8ec make it easier to use xml.lite (#396)
1059b7da1 allow for explicit use of a UTF-8 string (#395)
27de8b8a4 Optionally record how std::string is encoded when manipulating XML (#378)
e0018cea7 implement some <filesystem>-like routines until we can use C++17 (#388)
cafb2365b Merge pull request #363 from mdaus/feature/fix-compiler-warnings
6a78bec20 use the existing sys::ubyte rather than making our own pre-C++17 std::byte
14c9fc4ca fix a couple of G++ compiler warnings via static_cast<>
e596a6007 std::numeric_limits<T>::epsilon() can be "constexpr"
78b0f6bb2 another try at removing the compiler warning from tiff::split()
8e1de21e1 fixed typo; added a few nots about why we're not using strncpy()
fed3ba8cd retore previous tiff::split() code as the change got rid of the compiler warning but wasn't portable
98a589616 get rid of g++ strncpy() warning
798f84711 don't use memset(0) with C++ objects
7f697d078 casting result of system() to void doesn't get rid of compiler warning
d55a849c5 remove new g++ compiler warnings in WSL
d0aaa2988 Merge pull request #361 from mdaus/feature/fix-compiler-warnings
cc62e866b fix compiler warnings
d45c1f9a0 Updates based on peer review comments which include changing ostream to pointer, adding a couple of more tests, and updating all auto_ptr to unique_ptr in unit test.
fb12ba126 Update ArgumentParser to use a stream as an argument if the ignore unknown argument flag is set to true.
536d2b0ca Added ability to ignore unknown arguments in the ArgumentParser.
27288f49b Merge pull request #358 from mdaus/conan-options
fd5e1eecb Expose additional CMake options in conan recipe
c97216179 Remove unneeded CMake function

git-subtree-dir: externals/coda-oss
git-subtree-split: cbfb20ce2e64635131ed17790d93bd54b78754d6

* Squashed 'externals/nitro/' changes from 496bfba71..342f55276

342f55276 NITRO 2.10.13 (#542)
f0cc26bdd latest from coda-oss (#540)
b39ccc4c0 Fix conan build issues (#516)
103dd73ee latest from coda-oss (#508)
f71128d6f Adding tarfile member sanitization to extractall() (#505)
61dafd407 NITRO-2.10.12 (#496)
06993176d run unittests in SIX (#495)
f0d801e95 coda-oss release 2022-08-30 (#494)
8477e4729 Build jpeg decompression as a plugin. (#487)
59978233a latest from coda-oss (#493)
53bbc6679 latest from coda-oss (#492)
77a1114eb NITRO 2.10.11 (#491)
b5fb2d2a9 another round of removing compiler warnings (#489)
2342edbef coda-oss 2022-08-02 (#490)
7e1fe6a68 NITRO-2.10.10 (#486)
263a98cfc coda-oss 2022-06-29 (#485)
a3bb3a032 nitf::byte is too much trouble right now (#484)
8d28243d2 update CodeQL to @v2 (#483)
7091d36a6 Update coda-oss (#482)
f40179473 return std::optional<> from "enum" utilities (#480)
3972dba9e update coda-oss (#479)
3e38c39a0 latest from coda-oss (#477)
f27a3894e Do not add convenience test targets if given the libs_only flag.
ed0d1899b NITRO-2.10.9 (#476)
f4eacccaf coda-oss release 2022-05-03 (#475)
758ac88e1 latest from feature/j2k branch (#474)
b8a3f5076 tweaks to allow NITRO modules to be built as DLLs (#473)
af745281c latest from feature/j2k branch (#471)
a7da2fc74 build more C code as C++ (#469)
5dbd0d9cd latest from coda-oss (#468)
3e9387973 add lossy compression options (#464)
da6969ae0 latest from coda-oss (#465)
bd8ce8116 build most C with C++ (in Visual Studio ONLY) for better error-checking (#466)
dfeb3fe44 remove docs directory (#463)
2d52cf3f6 remove archive directory (#462)
5b11fe82c copy j2k code from coda (#460)
f02c70645 merge develop/update_coda-oss
8907b9fc3 latest from coda-oss (#461)
1124c00f9 switch VS unit-test projects to VS-test (#459)
c6e7a6e40 Merge branch 'master' of github.com:mdaus/nitro
ed828aaf6 fix CodeQL diagnostic
762b2a2ce NITRO version 2.10.8 (#456)
466534fd8 begin work in C++ wrappers for 'j2k' C API.
3b72561d2 update to coda-oss release 2022-02-22 (#455)
3f70bc3c3 latest from coda-oss (#454)
8a8ea90b0 build with older C++ compilers, compile C as C++ (#453)
9690f9076 update coda-oss (#451)
1d307d9aa latest from coda-oss (#449)
c71dc6d85 latest from coda-oss (#448)
db9f1d2a5 account for missing std::is_trivially_copyable<>  (#446)
7581fe17d latest from coda-oss (#445)
d991a0494 infrastructure to support "reflection" over C structs (#444)
edaf47f81 show how to use strongly-type TRE fields (#440)
8af36f6ed latest from coda-oss (#441)
fe89ce317 Re-add show_nitf++ app (#439)
9ea44741d nitro 2.10.7 (#436)
458055cfc coda-oss release 2021-12-13 (#435)
d4ad4b8a5 allow NITF_PLUGIN_PATH warning to be turned off (#434)
7c96994a9 allow NITF_PLUGIN_PATH warning to be turned off (#432)
1b22d00a6 latest from coda-oss (#431)
489f10d70 tweaks from develop/jdsmith (#426)
9461c626c latest from coda-oss (#425)
2e8d7cfae tweaks for new compiler on Windows (#424)
e868e3747 build with VS2022 (#423)
65b4df02d Build with Visual Studio 2022 (#422)
64dc4e118 -j 2 to prevent G++ crash
64ec3748c try -j 2 for faster build
c4e122edf include all of coda-oss (#421)
888ae9293 update version numbers before cutting a new release (#420)
28d95160e Tweaks from SIX's 8AMPI_PHSI branch (#418)
a0dd912a9 latest from coda-oss (#419)
dfba5e291 fix CodeQL failure (#417)
3c7653c3e make building as a DLL easier (#416)
e17d918d4 read in 8-bit sample files using NITRO (#415)
b78673982 use strongly-typed enums rather than overload strings (#414)
30fc68feb latest from coda-oss (#413)
a4a1fc4f8 add a NITF version number (#412)
eef3c6ec8 update coda-oss (#411)
f5f1f8ce1 "nitro" changes from SIX (#410)
1a19b6b60 latest from coda-oss (#409)
0db498f1e make the TRE API more robust (#406)
404a857ca Bugfix/engrda (#405)
1c73a5284 latest from coda-oss (#404)
9388d5cf2 latest from coda-oss (#402)
9578bcf83 Handle amp-phase data (#403)
81278527b remove compiler warnings that were clobbered by a previous merge (#401)
3ebffd877 update coda-oss (#400)
c8186387f tweak C++ API (#399)
dc000a516 latest from coda-oss (#398)
7af555d63 latest from coda-oss (#396)
cb37a8cff remove compiler warnings (#395)
1b6cfe099 latest from coda-oss (#388)
2229fbde0 forgot to add "units" to CMakeFiles.txt
e1a1bcefa latest from coda-oss (#387)
835da56f5 Bugfix/nitropy import error (#381)
508ee3e75 Fix invalid const cast error (#380)
7bb82996c update coda-oss (#378)
98e6bcf5d remove more code-analysis diagnostics (#377)
c3dc82205 update coda-oss (#376)
ffd5aa858 Revert "do a Debug build on Windows"
5d84be10c do a Debug build on Windows
e6cfbfab8 make parts of the C++ API a bit more python-like (#375)
75caf49ec remove compiler warnings/code-analysis diagnostics (#374)
a6cec9dfe update coda-oss (#373)
f4b80a31d reduce compiler warnings (#371)
4ddaf23d8 remove compiler warnings (#370)
2a57741c2 update coda-oss (#369)
d3fab714a update coda-oss (#368)
8806960a8 tweak to force rebuild of "master" on github
9aee934ea remove compiler warnings (#367)
7be6c13b1 set an "invalid" string result for invalid inputs (#366)
d4f244ee8 remove more compiler warnings/code-analysis diagnostics (#364)
d01179540 latest from coda-oss (#363)
a16f72b0c make it easier to build nitf-c++ as a shared library (#362)
35c5f4ade reduce compiler and code-analysis warnings (#361)
273c39e86 latest from coda-oss  (#360)
298536f40 remove unused coda-oss modules to fix? broken build (#351)
edb9317db Update README.md
152b1d66a Java and MATLAB bindings are no longer built.
2748224ba unittests work from clean build in VS2019 (#347)
296750e1d Delete codacy-analysis.yml
2121cda37 Delete checkmarx-analysis.yml
393b6cd55 Create codacy-analysis.yml
a01fa4d6f Create checkmarx-analysis.yml
effd34006 fix more CodeQL diagnostics (#346)
a2b3a12d9 Fixed bug in python interface, and enabled a few features in the c library to be accessible from python (#342)
1e171cdfc remove code-analysis diagnostics (#345)
c68cd17dd latest from coda-oss (#344)
bb0634924 update coda-oss (#343)
fa20f42ee use new coda-oss header for easier access to "std::" (#341)
c80e163ee Build w/older compilers; remove some code-analysis diagnostics (#340)
dfad79efc Delete ossar-analysis.yml
007ced759 archive matlab and java (#293)
0e201d8b0 Create ossar-analysis.yml
c4eae8e4c Create codeql-analysis.yml
ea1946b4a Delete codeql-analysis.yml
e40a0b3f6 add ENABLE_ASAN to turn on address sanitizer (#336)
2d9a968f2 fixed a bug where an uninitialized pointer caused a crash (#335)
7c5dbed7f `nullptr_t` should be `std::nullptr_t`
612a55889 remove version number from externals/coda-oss (#333)
c14639765 nitro doesn't need "re" module (#332)
14517c04f put a version on externals/coda-oss (#331)
8705bbb63 C iterator routines can be "const" (#330)
62ec49119 update coda-oss (#326)
b7f04aecb fix broken unit-test; implement missing overload (#325)
f810f8f6e Fix length calculation for moveTRE and unmergeTREs (#324)
ad0f83a6f Null init Image writers (#323)
e77ddad8f CMake: Build c libraries, in Windows, as DLLs (#321)
7a8dcf296 update coda-oss (#322)
f0a45b36d latest from coda-oss (#320)
d277cb432 revert c99 changes (#319)
1b6ae6adb hide template<template> from C++11 (#318)
ee89c7d34 Bug fixes, new TREs, and cython interface (#314)
f925204cb revert c99 changes (#317)
1615ce17b update coda-oss (#316)
0fbebcbdc update coda-oss (#313)
280141628 fix errors/warnings from code-diagnostic tools (#312)
f419dc538 Update .gitignore for CMakeSettings.json
2d73f0ee1 latest from coda-oss (#311)
0d6988eb1 latest from coda-oss (#310)
29a88056b get coda-oss #includes via coda-oss.hpp to augment "std" (#309)
5be4b7e63 "noexcept" is a breaking change ... be more careful with it. (#307)
92b19f9c5 remove nitf::byte (#306)
c1ef1e933 bring over non-breaking changes from "main" (#303)
1d91f312e latest from coda-oss (#300)
e6448b1dd tweaks so that six builds with nitro updates (#299)
d27779eb7 std::byte -> nitf::byte until we can use C++17 everywhere (#298)
413fadf3a Update .gitignore
5c6a2ef68 update coda-oss (#297)
8bb4d248c build with Visual Studio 2019 (#295)
698841c86 get unittest changes from main (#294)
9a29ce5f9 latest from coda-oss:master (#291)
67d325690 reduce compiler warnings and the like from C code (#292)
5c8c30b1c build new TREs w/CMake (#246)
4efc97eaf Add four TREs defined in MIL-PRF-89034. (#192)
e13921039 tre: add MATESA support (#244)
7e9b93f71 Create codeql-analysis.yml
eaafd58a1 java: update to supported version (#241)
59afdc92e Fix bug with myResidual calculation (#204)
050fcbc96 Fix assorted compiler warnings (#232)
cad5c02f9 update "documentation" (#231)
0fb160719 Revert "merge "main" into "master" (#224)"
0faaa0165 merge "main" into "master" (#224)
5579e74e8 update "master" with several changes from "develop" (#219)
ed0063048 coda-oss doesn't build "macos" so we don't either (#218)
033220f92 latest coda-oss from master-C++17 (#212)
7caacb941 copy some documentation from the old website; work-in-progress (#211)
0f0d05404 Feature/remove compiler warnings (#210)
9a609577c Feature/use standard c types (#209)
c83348fd3 ignore more build artifacts
3bb1ef02e Merge pull request #205 from mdaus/bugfix/Security-vulnerability-in-nitro
9757b5af5 fix a bunch of code-analysis warnings about using NULL pointers (mostly …
6b72b7c37 fix a bunch of code-analysis warnings about using NULL pointers (mostly benign as pointer won't actually be NULL)
22716b796 be sure local variables are initialized for all code paths
c0b7b38b9 no .vcxproj in this branch
40d66294a fix some build warnings
362b5492e build with VS2019 CMake support

git-subtree-dir: externals/nitro
git-subtree-split: 342f552768e249e86df702062ff3f60ea1ec813a

* copy_externals.csh

* latest from coda-oss and NITRO

* Squashed 'externals/coda-oss/' changes from e87c32b4d..857ff0af3

857ff0af3 HighFive utility routines (#661)
35c19e7e8 change actions to @v3 (#660)
cde6147ce tweak HighFive wrappers (#659)

git-subtree-dir: externals/coda-oss
git-subtree-split: 857ff0af32ebe20a6f1d7059f1f12edf904a2ec0

* Squashed 'externals/nitro/' changes from c8ecbe9ae..90d513ac5

90d513ac5 latest from coda-oss (#543)

git-subtree-dir: externals/nitro
git-subtree-split: 90d513ac5c6edc5bc0be8ac8abec2c1f071b077d

* latest from coda-oss and NITRO

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from 857ff0af3..f6489b6be

f6489b6be Merge branch 'main' into feature/xml.lite_tweaks
836c426a2 use function-pointers so that isConsoleOutput is only checked once
56e3c45b1 move depthPrint() functionality into non-member function in preparation for future changes
ddcd26d97 Merge branch 'main' into feature/xml.lite_tweaks
69cc0e506 use the more rigorous create_and_check_datatype()
9efb87558 Merge branch 'main' into feature/hdf5
4d2f2f417 more HighFive unittests (#662)
14191a844 HighFive::create_datatype() goes from C++ to HighFive
98583473f utility routines to read string attributes
1fa75ce81 use the C API to read a string attribute
71e7b69f5 still can't figure out how to read a string attribute :-(
e96f37a69 test reading the file attributes
a25244519 getAttribute() unittest
8f12a3000 getDataType() unittest
1d687db57 writeDataSet() utility overload
106aa6894 sigh ... H5Easy::dump() fill fails on Windows/WAF :-(
2641b60b2 Merge branch 'main' into feature/hdf5
212bbd3a3 works on local machine, but not build server ... ?
7125118b0 dump of 1D vector doesn't work :-(
c704db435 sigh ... WAF build still failing :-(
01aae4616 does dump() of a 1D vector work?
76a53c813 comment-out H5 writing :-(
0f0e19aff test_highfive_dump()
cb8f73795 trying to get highfive_dump() unittest working w/Windows-WAF
6584a264a does test_highfive_create() work?
316566854 Revert "trying HighFive "write" unittests again"
a9ec24ca4 trying HighFive "write" unittests again
585ad49a5 tweak names of utility routines
4c91a4d97 make it easier to read a std::vector and std::vecotr<std::vector>
0217ffa26 readDataSet() now works for 1D data
95e8973f2 trying to get hdf5::lite::load() working
4d294611d "const" correctness
5e6305c3f fix load_complex()
4a134dc5f start work on utility routines to read complex data from HDF5
9d76a7f41 Merge branch 'main' into feature/hdf5
8f9667a24 whitepsace
ebd3fc99e Merge branch 'main' into feature/hdf5
40091b069 comment-out writing tests for now ... need to figure our WAF bulid failure
935aa3459 be sure the dataset has real data
114b9bf33 update release notes
bd9c0b26c tweak HighFive utility routines
acda1ef57 turn off diagnostics around expected failures
22a748840 readDataSet() utility routine for HighFive
bd88a8c25 HighFive writeDataSet() utility to work with our SpanRC
6142f5b33 use HighFive routines to write a HDF5 file
5bbf1abaf Use HiveFive routines to get info about the file
84fbc8378 duplicate unittests with H5Easy
f1f054c03 Merge branch 'main' into feature/hdf5
9b63ca470 fix directory names
f6f826689 fix directory names
7aeb82c33 Merge branch 'main' into feature/hdf5
d028baaeb hook up HighFive header-only library (#653)
3083b0a31 Revert "HighFive 2.6.2"
246985a7f Revert ""build" HighFive HDF5 library"
a8b75a586 Revert "turn off HighFive Boost support"
ec68d5f83 Revert "Add HighFive unittests"
f1f85b9e7 Revert "get test_high_five_base more-or-less compiling"
5ea634ee1 Revert "more work on getting HighFive unittests to build"
ecc45433c more work on getting HighFive unittests to build
bb194788a get test_high_five_base more-or-less compiling
d42bde000 Add HighFive unittests
ddc86bb32 turn off HighFive Boost support
b255122d4 "build" HighFive HDF5 library
396cc3ef2 HighFive 2.6.2
5e5f9d9c0 Merge branch 'main' into feature/hdf5
ee938b4a5 changes from SIX
bb764df90 Merge branch 'main' into feature/xml.lite_tweaks
de2a24380 make derived classes 'final' if possible
14e19bcd2 Change xml lite function to virtual (#645)
8f42ac8e9 Merge branch 'main' into feature/xml.lite_tweaks
18ad90645 hdf5Write unittest
3462e1179 createFile() and writeFile() overloads
ecee81d53 fix typos
197eecfa6 sketch-out hdf5::lite::writeFile()
bd2311795 use SpanRC for writeFile(), not yet implemented
ea9af7510 simple SpanRC to hold a 2D-size and pointer
027c19ee8 createFile() unittest
1f9d07ecb hook up createFile()
8c7e4473f start hooking up HDF5 writing
146e0bea3 Merge branch 'main' into feature/hdf5
88ca9fcb7 Merge branch 'main' into feature/hdf5
42b604b46 Squashed commit of the following:
10ee602c2 Merge branch 'main' into feature/hdf5
67aa42b69 restore changes from "main"
8bbfcbfbf unittests can be simplified to match fewer "view" classes
126bb802e Merge branch 'main' into feature/hdf5
3f8ba7a42 again, don't need a class just to convert from std::vector<> to std::span<>
24c2b489c Squashed commit of the following:
2703c119d Squashed commit of the following:
9d5228a2b don't need an entire class just to convert a std::vector<> into std::span<>
51bc931dc Merge branch 'main' into feature/hdf5
a84f25816 Squashed commit of the following:
c4d2ed696 add missing #include guards, fix type in existing #include guard
d541525a0 use a single ComplexViewConstIterator for all views
86e6a459f CODA_OSS_disable_warning causes GCC errors :-(
5d4b9c2cb only need an custom iterator for ComplexSpansView
d9f0fb128 hook up iterators
b9329e4db initial pass at a ComplexViewConstIterator
635238873 remove compiler warning about unused "constexpr" variables
b39f6096f use the casing from H5 to make copy/pasting code slightly easier
0887b13eb Merge branch 'main' into feature/hdf5
bd07df1ca Consistent casing for Dataset, Datatype, Dataspace
7acd30ee2 tweak hdf5.lite dependencies
38ab914df Jupyter notebook for creating H5 files
95a040e0b _small.h5 is now (correctly) FLOAT32
107e7c487 make a simple values() member function to avoid template magic
e1feca919 use TEST_SPECIFIC_EXCEPTION macro instead of try/catch
738333688 readDatasetT() now throws for the wrong buffer type
6b2cc2529 Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5
310f8fd3d can't get template magic right for copy_axis()
86b306d59 stepping through copy ctors in the debugger is annoying
f243e92d6 trying to make wrong type of buffer fail
2b10d9652 read in new sample file
a28e59d8c help the compiler with type deduction
49bf5e9bc nested_complex_float_data_small.h5
e029325fc utility routines to "deconstruct" and array of std::complex
dede3bd39 Merge branch 'main' into feature/hdf5
904b1ef5e tweak class names, make_() and copy() utility routines
8237b9efb make it harder to pass the wrong types to ComplexViews
4d9aeda2c ComplexArrayView and ComplexParallelView utility classes
f5e367dfa test std::span<const std::complex<float>>
a4a2844f2 read in the nested "i" and "r" data
115615265 sample file has subgroups
8e1b7869a Merge branch 'feature/hdf5' of github.com:mdaus/coda-oss into feature/hdf5
9f4232a1d update sample H5 file
8c55db73a walk through HDF5 sub-groups
7775ed9c4 Update 123_barfoo_catdog_cx.h5
677975d7c Matlab code to create sample H5 file
a0e7dfe07 Update test_hdf5info.cpp
0b67e1602 pass __FILE__ and __LINE__ from calling site for a more accurate exception message
86a677321 skeleton for more sample data
85f79b099 Merge branch 'main' into feature/hdf5
18088e942 Merge branch 'main' into feature/hdf5
3a1d17692 Merge branch 'main' into feature/hdf5
1755c69d7 Merge branch 'main' into feature/hdf5
9ad015432 No more "11" suffix on exception names
c20d96251 Squashed commit of the following:
c88cee999 other values to be filled-in
bca4a4ecd incorporation NamedObject from HDF5 docs
61fa68f72 groupInfo()
460e7d766 datasetInfo()
14eb9b764 start filling in DatasetInfo
afe5f1c3a start to fill in DatasetInfo
77a968c72 start filling in GroupInfo
d81bcdfd9 openGroup() to open groups (loc)
a0cd29469 comment-out "dataset" unittest for now
86e006024 begin filling in FileInfo
366dda6ab a return_type_of utility is needed to deduce the return type
e21928263 explicitly pass return type to template
4937ccd11 template to reduce boilerplate when calling try_catch_H5Exceptions
b3b5ebde7 use new exception utility routines
ea1c03ef0 put exception handling/conversion in a utility routine
819a99d39 utility routine for exception handling
6f34eea97 put utilities in a separate file for easier reuse
fcbde4f24 break utility routines into smaller pieces for easier reuse
52358ea8a WIN32 no longer automatically defined?
5a4286472 Revert "build HDF5 with C89"
680e599e9 build HDF5 with C89
a87a07121 Merge branch 'main' into feature/hdf5
8447c1a90 Revert "sym-links instead of copying files"
db3b5e12b Merge branch 'main' into feature/xml.lite_tweaks
fb60b5696 Merge branch 'main' into feature/hdf5
5110a5cc8 Comments about _u and _q
1a937d32c Merge branch 'main' into feature/xml.lite_tweaks
fa06f04d7 get ready for hdf5.lite enhancdements
b040c7c43 sym-links instead of copying files
aa431bb47 use _u for xml::lite::Uri
3d0c6d58c fix case-sensitive #include filename
93dcd0e52 operator() for getElementByName()
75a93af85 more operator[] overloads to make attribute management easier
4ab8216f8 user-defined string literals to remove some noise around xml::lite::QName
f82f0b0fc Merge branch 'main' into feature/xml.lite_tweaks
ae30e3644 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks
ffdd9beb0 simplify attribute creation
9bf5414f5 simplify attribute creation
82d7a4e95 SWIG gets confused about namespaces
7a61d0741 fix bug on Element ctor uncovered by unittest
fdd7e58c1 QName is also in the xerces namespace which confuses SWIG bindings
a325b7053 operator+=() overload for addChild
daf30e6c0 Merge branch 'feature/xml.lite_tweaks' of github.com:mdaus/coda-oss into feature/xml.lite_tweaks
b887d2b47 provide overloads for Element& rather than creating new "reference" types
1fa6bba38 rename test_xmleasy.cpp
7c8c9e0f1 += overload
850da6f63 overload for std::string
4547fc5a7 use UIT-8 strings for characterData
4723462a3 convenient addChild() overloads
e48720753 copy over ElementReference from xml.easy
a4ca30a0d Merge branch 'main' into feature/xml.lite_tweaks
6ae9f0b71 Revert "check-in of new xml.easy (to move code between computers)"
f7466a6d7 Revert "simple routines for single element"
a5490230d Revert "make some operators simplier ways of calling functions"
c9a25630a Revert "get document creation working"
8af8710b0 Revert "free functions instead of member functions"
16c3847cb Revert "ElementReference distinct from Element"
7d68e156f Revert "ElementMutableReference"
00eb2a282 Merge branch 'main' into feature/xml.lite_tweaks
a42969c1f ElementMutableReference
a20ae9355 ElementReference distinct from Element
14eeeea0b free functions instead of member functions
4aae014b3 get document creation working
883569269 make some operators simplier ways of calling functions
053bd1212 simple routines for single element
8bf701a2e check-in of new xml.easy (to move code between computers)
41f959051 unittests for creating XML documents from scratch
9752d50ae Merge branch 'main' into feature/xml.lite_tweaks
1531d5709 by default, don't validate strings passed to Uri()
46d13d4bf Merge branch 'master' into feature/xml.lite_tweaks
39b547d32 remove more vestiges of Expat and LibXML
ec8274d52 remove LibXML and Expat as they're no longer used/supported.
20eeefeef Merge branch 'master' into feature/xml.lite_tweaks
95074b9b1 update for newer Intel compiler
7024f71e1 Merge branch 'master' into feature/xml.lite_tweaks
57b1cbc83 Merge branch 'master' into feature/xml.lite_tweaks
4b67561c3 remove validate() overload that nobody is using
fa15f1e5d Squashed commit of the following:
1484a9090 test the new validate() API
470da70fb hookup StringStreamT routines
2cddf2504 begin hooking up validate() overloads
1b5d910f3 overload validate() for UTF-8 and Windows-1252
03309b8c9 Squashed commit of the following:
b72c6c5bf older compiler doesn't like our make_unique
af8f00307 validate UTF-8 XML on Linux
211188613 unit-test for LEGACY XML validation
3c1169d2b Squashed commit of the following:
3afff19ca std::filesystem::path for FileInputStreamOS
908d452f8 WIP: validate all of our sample XML files
00f9bb16b validate against a XML schema
243d8c356 Merge branch 'master' into feature/xml.lite_tweaks
2815d707d fix to work with SWIG bindings. :-(
460862132 trying (again) to remove vestiages of old code
e3c83a858 Revert "new code should use UTF-8"
811207c92 new code should use UTF-8
0ffd835f9 Squashed commit of the following:
1e7e03ded Merge branch 'master' into feature/xml.lite_tweaks
c1d806aff Merge branch 'master' into feature/xml.lite_tweaks
850d3c811 str::strip() that can be easier to use than str::trim()
580ba9c8c explicitly =delete move
2b39831a8 Squashed commit of the following:
39eebdc23 Merge branch 'master' into feature/xml.lite_tweaks
9adf86cba force calling new UTF-8 write() routines
ea61b6204 Merge branch 'master' into feature/xml.lite_tweaks
8a34583fa overload to take schemaPaths as filesystem::path
8671b442f parse XML embedded in a binary file
ec4a902f1 updates from xerces.lite
80dc4d963 updates from xerces.lite
549766d6c Attributes::contains() no longer catches an exception
8a645ceac need "sys/" when building in other environments
36af08269 super-simple URI validation
78ef28a3e SWIG bindings are a PITA! :-(
e9cba8491 SWIG needs help with Uri
8a8d8dc07 another routines used by pre-build SWIG bindings
818e1ec5d pre-build SWIG bindings use getElementByTagName() member function
067cac5d8 old compiler gets confused on unadorned QName
ba92c0ae7 more use of Uri and QName
446c7d17a use QName in new code
d6f8b0c83 more direct use of QName
90fff1c73 use xml::lite::QName instead of tuple<string, string>
646cbb5ed more direct use of QName and Uri
ba589ea3b make QName more robust
bab0ee8b5 createElement() -> addNewElement()
e3a145747 grab changes from six-library
32285e95c Merge branch 'master' into feature/xml.lite_tweaks
9f79f0bf6 Merge branch 'master' into feature/xml.lite_tweaks
a12bbc32c make it easier to create new Elements with a value
fc9967f98 make it easy for callers to addChild() keep a reference to the Element
4627766b7 be sure test_xmlparser works in "externals" of other projects
bf2276396 "private" is part of the name-mangling
fad92bcc8 making sure copy-ctor is implemented
f90fdcead consolidate common XML test code
9fc53f2d5 use str:: utility for casting
6da6f794b still trying to find the right macro for SWIG
0c1b86c56 still trying to fix SWIG
fdc6fc9bd trying to fix SWIG build error
7835e8c27 SWIG needs copy-ctor
585695942 disable copy/assignment for Element, it's probably almost always wrong
391fed613 fix double-delete caused by copying
61790fe69 retry parsing XML with Windows-1252 if first parse() fails
63cffac59 change string_encoding to match coda-oss style of PascalCase
010479bbe read an XML file we know is wrongly encoded as Windows-1252
9a0505062 more references instead of pointers
2d44b6951 Reading Windows-1252 w/o "encoding" fails
63dc7b076 read Windows-1252 too
c9434c9cb test as UIT-8 too
f310ccf0c get reading from UTF-8 XML working on Windows
1fa39c2be get testReadUtf8XmlFile working on Linux
1a83cd815 sys::Path is too much trouble right now
ed60aa22c unit-test to read XML from a file
a9336db7c Squashed commit of the following:
0825beb0d Merge branch 'master' into feature/xml.lite_tweaks
c618489be Merge branch 'master' into feature/xml.lite_tweaks
e8e4b8fe1 determine string_encoding based on platform
1f43bcfc2 create a new Element by using the platform to determine "characterData" encoding
961bef66b Merge branch 'master' into feature/xml.lite_tweaks
e9798a5cb fix static_assert()
6f7772874 Merge branch 'master' into feature/xml.lite_tweaks
b98d4f5a9 Merge branch 'master' into feature/xml.lite_tweaks
1b5abba2a The (old) version of SWIG we're using doesn't like certain C++11 features.
53bdeabaf Merge branch 'master' into feature/xml.lite_tweaks
60cf8ae80 "" doesn't work with decltype() in older C++
97e72477a reduce getValue() overloads by making "key" a template argument
5e6373e55 reduce code duplication
f9e7cfeee provide castValue<T> instead of getValue(T&)
cbd0bd8f2 castValue<T> throws instead of returning a bool like getValue(T&)
87c7514fc Merge branch 'master' into feature/xml.lite_tweaks
10cc61223 make getElement*() consistent for zero or >1 results
f5b137e3c Merge branch 'master' into feature/xml.lite_tweaks
1765efc62 allow clients to specify toType() and toString() for getValue() and setValue()
df8b746e1 allow clients to specify their own toType/toString routines
66702726a Merge branch 'master' into feature/xml.lite_tweaks
6956311f1 Merge branch 'master' into feature/xml.lite_tweaks
d505f3593 Merge branch 'master' into feature/xml.lite_tweaks
fbd106115 catch a BadCastException and return false from getValue()
3a78377b5 use a template to reduce duplicated code
0ad4b8606 Merge branch 'master' into feature/xml.lite_tweaks
a848aa3a2 get & set the characer data as a type
f3ee1ee12 utility routines to set an attribute value
595227683 templates to get an attribute value convert to a specific type
06639227b miised a change in last commit
1aa458ef8 add getValue() overloads that return true/false rather than throwing
faa6d3075 added getElementByTagName() overloads as that's a very common use-case

git-subtree-dir: externals/coda-oss
git-subtree-split: f6489b6bef104d78dacf427901c6a5415a00baec

* Squashed 'externals/nitro/' changes from 90d513ac5..90c6263e2

90c6263e2 latest from coda-oss (#544)

git-subtree-dir: externals/nitro
git-subtree-split: 90c6263e218e20f9d974520d955638ec35ac1085

* Squashed 'externals/coda-oss/' changes from f6489b6be..0b7d581fa

0b7d581fa remove transform_async() (#663)

git-subtree-dir: externals/coda-oss
git-subtree-split: 0b7d581fa62a58ca730fbbf58d24c8ef8b32f764

* latest from coda-oss

* account for sys::byteSwap changes

* Squashed 'externals/coda-oss/' changes from 0b7d581fa..e85ec9331

e85ec9331 --output-on-failure for CTest (#666)
e80376197 turn off "there is no warning number" warning
c5f0a5d15 A C-string may not be NULL-terminated (#665)
0c5eb29ae use platform-specific routines for byteSwap() (#664)

git-subtree-dir: externals/coda-oss
git-subtree-split: e85ec93317a11cf32541b0f0312cacb772777d38

* latest from coda-oss

* latest from NITRO

* Squashed 'externals/coda-oss/' changes from e85ec9331..c120e3255

c120e3255 be sure parameter is used to avoid compiler warning

git-subtree-dir: externals/coda-oss
git-subtree-split: c120e3255d38337020b65b193509abef14c1429c

* Squashed 'externals/nitro/' changes from 90c6263e2..3b52f0025

3b52f0025 latest from coda-oss (#547)

git-subtree-dir: externals/nitro
git-subtree-split: 3b52f0025a286023775c2887dddda30a189937e0

* latest from NITRO

* account for sys::byteSwap changes

* latest from coda-oss

* byte-swapping single-bytes makes no sense

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from c120e3255..0774c03c4

0774c03c4 threaded byteSwap() (#667)
d156370d3 swapping a single-byte value makes no sense

git-subtree-dir: externals/coda-oss
git-subtree-split: 0774c03c460327bd43beeff1a4e6a275630eb8ea

* Squashed 'externals/nitro/' changes from 3b52f0025..089ba0b5b

089ba0b5b latest from coda-oss

git-subtree-dir: externals/nitro
git-subtree-split: 089ba0b5ba9560e0f00b14c0bbfd07b3717cd78c

* copy_externals

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from 0774c03c4..540ae763e

540ae763e more byteSwap() tweaks

git-subtree-dir: externals/coda-oss
git-subtree-split: 540ae763e55f3789a04ac20e81e3d2500ac3c221

* restore commented-out unittests

* latest from coda-oss

* build with latest byteSwap() changes from coda-oss

* Squashed 'externals/coda-oss/' changes from 540ae763e..cbc659db2

cbc659db2 add swapBytes() utility from SIX (#669)
891481b64 simplify byte-swapping (#668)

git-subtree-dir: externals/coda-oss
git-subtree-split: cbc659db27ff9156be3fe9c92d4efed1cba8837d

* found two more sys::byteSwapV()s

* latest from coda-oss

* coda-oss now provides as_bytes()

* latest byte-swap from coda-oss

* latest from coda-oss

* fix call to in-place byteSwap

* latest from coda-oss

* Squashed 'externals/coda-oss/' changes from cbc659db2..47684c45b

47684c45b byteSwap now uses byte buffers (#670)

git-subtree-dir: externals/coda-oss
git-subtree-split: 47684c45b8d938265cca26d64b39f75d6e57d11f

* Squashed 'externals/coda-oss/' changes from 47684c45b..1f9fd88d6

1f9fd88d6 remove spurious

git-subtree-dir: externals/coda-oss
git-subtree-split: 1f9fd88d6d54b3e70e7c23a05e213c8e10c5fa37

* xml.lite changes from coda-oss

* latest from NITRO and coda-oss

* Squashed 'externals/coda-oss/' changes from 1f9fd88d6..ff4f820ed

ff4f820ed xml.lite tweaks to support SIDD 3.0 ISM (#672)
b1de8c0e5 std::byte should be a unique type (#671)
c05bf9a02 allow enums to be byte-swapped too

git-subtree-dir: externals/coda-oss
git-subtree-split: ff4f820ed8c406d43e3768508ca06d1a334b831f

* Squashed 'externals/nitro/' changes from 089ba0b5b..2fd7a0bfa

2fd7a0bfa latest from coda-oss (#552)
0eecce004 invoke() utility to reduce code duplication (#550)
59fb02fe9 latest from coda-oss (#551)
9fbf2b7b8 Fill out adapter free block which is used for nitf decompression (#549)

git-subtree-dir: externals/nitro
git-subtree-split: 2fd7a0bfa708a93a4bd17e44dbb4eba400b424d2

* copy_externals

* latest from coda-oss

* latest from CODA-OSS and NITRO

* Squashed 'externals/coda-oss/' changes from ff4f820ed..c00c1f203

c00c1f203 coda-oss release 2023-06-06 (#677)
ef54bbcd5 remove more compiler warnings (#676)
dadfc5ce6 distinguish between byte-swapping a buffer and single value (#674)
90187f6cd more xml.lite tweaks for SIDD-3.0/ISM (#675)
eb9960772 stronger type-checking for byteSwap() (#673)

git-subtree-dir: externals/coda-oss
git-subtree-split: c00c1f203d026ad5a3dfa27bc84a0c81bb7e71d6

* Squashed 'externals/nitro/' changes from 2fd7a0bfa..8f974e995

8f974e995 NITRO-2.11.3 (#554)
870aa6afd update to coda-oss 2023-06-05 (#553)

git-subtree-dir: externals/nitro
git-subtree-split: 8f974e9956e43e9c1cafb8adbe3c82f03b2491a8

* latest from CODA-OSS and NITRO

* sys::swapBytes() -> sys::byteSwapValue()

* account for more rigorous type-checking from coda-oss
---
 externals/coda-oss/ReleaseNotes.md            |   8 +-
 .../modules/c++/cli/source/ArgumentParser.cpp |   2 +
 .../modules/c++/coda-oss-lite.vcxproj         |   1 +
 .../modules/c++/coda-oss-lite.vcxproj.filters |   3 +
 .../c++/coda_oss/include/coda_oss/bit.h       |  14 +-
 .../c++/coda_oss/include/coda_oss/span.h      |  33 +++-
 .../c++/config/include/config/Version.h       |   8 +-
 .../modules/c++/mt/include/mt/RequestQueue.h  |   6 +-
 .../coda-oss/modules/c++/net/source/URL.cpp   |   6 +-
 .../polygon/include/polygon/Intersections.h   |  29 +--
 .../c++/sio.lite/source/FileHeader.cpp        |   1 +
 .../modules/c++/str/include/str/Format.h      |   2 +-
 .../modules/c++/str/include/str/Manip.h       |   4 +-
 .../modules/c++/str/include/str/Tokenizer.h   |   2 +-
 .../c++/sys/include/sys/AtomicCounterCpp11.h  |   8 +-
 .../modules/c++/sys/include/sys/ByteSwap.h    | 186 +++++++++++++++++-
 .../c++/sys/include/sys/ByteSwapValue.h       |  46 +++--
 .../sys/include/sys/ConditionVarInterface.h   |   4 +-
 .../modules/c++/sys/include/sys/Conf.h        |  20 +-
 .../modules/c++/sys/include/sys/DateTime.h    |  12 +-
 .../modules/c++/sys/include/sys/Err.h         |   8 +-
 .../c++/sys/include/sys/LocalDateTime.h       |   2 +-
 .../modules/c++/sys/include/sys/MutexCpp11.h  |   2 +-
 .../modules/c++/sys/include/sys/MutexWin32.h  |   2 +-
 .../modules/c++/sys/include/sys/OSWin32.h     |   2 +-
 .../modules/c++/sys/include/sys/Span.h        |  32 +--
 .../modules/c++/sys/include/sys/SysInt.h      |  45 +++++
 .../modules/c++/sys/include/sys/TimeStamp.h   |   4 +-
 .../coda-oss/modules/c++/sys/source/Conf.cpp  | 139 ++++++++-----
 .../c++/sys/unittests/test_byte_swap.cpp      | 169 ++++++++++------
 .../c++/tiff/include/tiff/GenericType.h       |   3 +-
 .../modules/c++/tiff/source/ImageWriter.cpp   |  14 +-
 .../modules/c++/tiff/source/Utils.cpp         |   4 +-
 .../include/xml/lite/ValidatorXerces.h        |   7 +-
 .../modules/c++/xml.lite/source/Element.cpp   |   3 +
 .../c++/xml.lite/source/NamespaceStack.cpp    |   1 +
 .../c++/xml.lite/source/ValidatorXerces.cpp   |  65 +++---
 .../c++/xml.lite/unittests/test_xmlparser.cpp |  55 +-----
 externals/nitro/ReleaseNotes.md               |   8 +-
 .../modules/c++/nitf/include/nitf/Version.hpp |   3 +-
 .../nitro/modules/c/nrt/include/nrt/Version.h |   2 +-
 six/modules/c++/cphd/source/ByteSwap.cpp      |   2 +-
 six/modules/c++/six/include/six/Data.h        |  16 +-
 six/modules/c++/six/include/six/Utilities.h   |  24 ++-
 44 files changed, 662 insertions(+), 345 deletions(-)
 create mode 100644 externals/coda-oss/modules/c++/sys/include/sys/SysInt.h

diff --git a/externals/coda-oss/ReleaseNotes.md b/externals/coda-oss/ReleaseNotes.md
index f473ce0160..bf8f97f3af 100644
--- a/externals/coda-oss/ReleaseNotes.md
+++ b/externals/coda-oss/ReleaseNotes.md
@@ -11,12 +11,18 @@
  ```
 # coda-oss Release Notes
 
-## [Release 2023-??-??](https://github.com/mdaus/coda-oss/releases/tag/2023-??-??)
+## [Release 2023-06-05](https://github.com/mdaus/coda-oss/releases/tag/2023-06-05)
 * *zlib* updated to [1.2.13](https://github.com/madler/zlib/releases/tag/v1.2.13).
 * new `mem::ComplexView` class to make it easier to process complex data stored in parallel. 
 * adjust compiler flags for clean *CMake* builds.
 * wrap common "file open" routines (e.g., `fopen()`) to support `sys::expandEnvironmentVariables()`.
 * add header-only [HighFive](https://github.com/BlueBrain/HighFive) HDF5-wrapper library.
+* Added a handful of [HighFive](https://github.com/BlueBrain/HighFive) utility routines.
+* `mt::transform_async()` removed, it doesn't match C++17 techniques.'
+* Revamp `sys::byteSwap()` for improved type-safety and
+  [better performance](https://devblogs.microsoft.com/cppblog/a-tour-of-4-msvc-backend-improvements/).
+ * Added case-insensitive string comparison utilties: `str::eq()` and `str::ne()`;
+   `xml::lite::Uri`s compare case-insensitive.
 
 ## [Release 2022-12-14](https://github.com/mdaus/coda-oss/releases/tag/2022-12-14)
 * removed remaining vestiges of `std::auto_ptr`, provide `mem::AutoPtr` for the tiny handful of
diff --git a/externals/coda-oss/modules/c++/cli/source/ArgumentParser.cpp b/externals/coda-oss/modules/c++/cli/source/ArgumentParser.cpp
index b2d47fab92..2a31bda458 100644
--- a/externals/coda-oss/modules/c++/cli/source/ArgumentParser.cpp
+++ b/externals/coda-oss/modules/c++/cli/source/ArgumentParser.cpp
@@ -294,6 +294,7 @@ std::unique_ptr<cli::Results> cli::ArgumentParser::parse(const std::string& prog
     std::map<std::string, Argument*> longOptionsFlags;
     std::vector<Argument*> positionalArgs;
 
+    positionalArgs.reserve(mArgs.size());
     for (auto& arg_ : mArgs)
     {
         cli::Argument* arg = arg_.get();
@@ -336,6 +337,7 @@ std::unique_ptr<cli::Results> cli::ArgumentParser::parse(const std::string& prog
     }
 
     std::vector < std::string > explodedArgs;
+    explodedArgs.reserve(args.size());
     // next, check for combined short options
     for (size_t i = 0, s = args.size(); i < s; ++i)
     {
diff --git a/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj b/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj
index d5e4e5cf81..2baf272d84 100644
--- a/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj
+++ b/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj
@@ -232,6 +232,7 @@
     <ClInclude Include="sys\include\sys\SemaphorePosix.h" />
     <ClInclude Include="sys\include\sys\SemaphoreWin32.h" />
     <ClInclude Include="sys\include\sys\Span.h" />
+    <ClInclude Include="sys\include\sys\SysInt.h" />
     <ClInclude Include="sys\include\sys\StopWatch.h" />
     <ClInclude Include="sys\include\sys\String.h" />
     <ClInclude Include="sys\include\sys\SystemException.h" />
diff --git a/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj.filters b/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj.filters
index a8119ff835..1e84491f23 100644
--- a/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj.filters
+++ b/externals/coda-oss/modules/c++/coda-oss-lite.vcxproj.filters
@@ -747,6 +747,9 @@
     <ClInclude Include="sys\include\sys\Span.h">
       <Filter>sys</Filter>
     </ClInclude>
+    <ClInclude Include="sys\include\sys\SysInt.h">
+      <Filter>sys</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="pch.cpp" />
diff --git a/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/bit.h b/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/bit.h
index 32ef77862e..271935ab0a 100644
--- a/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/bit.h
+++ b/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/bit.h
@@ -18,9 +18,9 @@
  * License along with this program; If not, http://www.gnu.org/licenses/.
  *
  */
+#pragma once 
 #ifndef CODA_OSS_coda_oss_bit_h_INCLUDED_
 #define CODA_OSS_coda_oss_bit_h_INCLUDED_
-#pragma once
 
 #include <stdlib.h>
 #include <stdint.h>
@@ -58,28 +58,28 @@ namespace coda_oss
     #if defined(_MSC_VER)
     // These routines should generate a single instruction; see
     // https://devblogs.microsoft.com/cppblog/a-tour-of-4-msvc-backend-improvements/
-    inline uint16_t byteswap(uint16_t val)
+    inline uint16_t byteswap(uint16_t val) noexcept
     {
         return _byteswap_ushort(val);
     }
-    inline uint32_t byteswap(uint32_t val)
+    inline uint32_t byteswap(uint32_t val) noexcept
     {
         return _byteswap_ulong(val);
     }
-    inline uint64_t byteswap(uint64_t val)
+    inline uint64_t byteswap(uint64_t val) noexcept
     {
         return _byteswap_uint64(val);
     }
     #elif defined(__GNUC__)
-    inline uint16_t byteswap(uint16_t val)
+    inline uint16_t byteswap(uint16_t val) noexcept
     {
         return bswap_16(val);
     }
-    inline uint32_t byteswap(uint32_t val)
+    inline uint32_t byteswap(uint32_t val) noexcept
     {
         return bswap_32(val);
     }
-    inline uint64_t byteswap(uint64_t val)
+    inline uint64_t byteswap(uint64_t val) noexcept
     {
         return bswap_64(val);
     }
diff --git a/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/span.h b/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/span.h
index b225f35fe1..6aff3b5d5a 100644
--- a/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/span.h
+++ b/externals/coda-oss/modules/c++/coda_oss/include/coda_oss/span.h
@@ -19,9 +19,13 @@
  * see <http://www.gnu.org/licenses/>.
  *
  */
+#pragma once 
 #ifndef CODA_OSS_coda_oss_span_h_INCLUDED_
 #define CODA_OSS_coda_oss_span_h_INCLUDED_
-#pragma once
+
+#include <type_traits>
+
+#include <type_traits>
 
 #include "coda_oss/namespace_.h"
 #include "coda_oss/span_.h"
@@ -41,21 +45,32 @@ namespace coda_oss
 
 // https://en.cppreference.com/w/cpp/container/span/as_bytes
 template <typename T>
-span<const byte> as_bytes(span<const T> s) noexcept
+inline auto as_bytes(span<const T> s) noexcept
 {
-    const void* const p = s.data();
-    return span<const byte>(static_cast<const byte*>(p), s.size_bytes());
+    // https://en.cppreference.com/w/cpp/types/is_trivially_copyable "... serialized to/from binary files ..."
+    static_assert(std::is_trivially_copyable<T>::value, "must be 'trivially' copyable.");
+
+    const void* const p_ = s.data();
+    auto const p = static_cast<const byte*>(p_);
+    return span<const byte>(p, s.size_bytes());
 }
 template <typename T>
-span<const byte> as_bytes(span<T> s) noexcept
+inline auto as_bytes(span<T> s) noexcept
 {
-    return as_bytes(span<const T>(s.data(), s.size()));
+    const span<const T> s_(s.data(), s.size());
+    return as_bytes(s_);
 }
 template <typename T>
-span<byte> as_writable_bytes(span<T> s) noexcept
+inline span<byte> as_writable_bytes(span<T> s) noexcept
 {
-    void* const p = s.data();
-    return span<byte>(static_cast<byte*>(p), s.size_bytes());
+    // https://en.cppreference.com/w/cpp/types/is_trivially_copyable "... serialized to/from binary files ..."
+    static_assert(std::is_trivially_copyable<T>::value, "must be 'trivially' copyable.");
+
+    static_assert(!std::is_const<T>::value, "T cannot be 'const'");
+
+    void* const p_ = s.data();
+    auto const p = static_cast<byte*>(p_);
+    return span<byte>(p, s.size_bytes());
 }
 
 }
diff --git a/externals/coda-oss/modules/c++/config/include/config/Version.h b/externals/coda-oss/modules/c++/config/include/config/Version.h
index bcb4979bdc..69944fc0b8 100644
--- a/externals/coda-oss/modules/c++/config/include/config/Version.h
+++ b/externals/coda-oss/modules/c++/config/include/config/Version.h
@@ -42,12 +42,12 @@ static_assert(CODA_OSS_MAKE_VERSION_MMPB(9999, 9999, 9999, 9999) <= UINT64_MAX,
 
 // Do this ala C++ ... we don't currently have major/minor/patch
 //#define CODA_OSS_VERSION_ 20210910L // c.f. __cplusplus
-#define CODA_OSS_VERSION_ 2022 ## 0012 ## 0014 ## 0000 ## L
+#define CODA_OSS_VERSION_ 2023 ## 0006 ## 0005 ## 0000 ## L
 
 // Use the same macros other projects might want to use; overkill for us.
-#define CODA_OSS_VERSION_MAJOR	2022
-#define CODA_OSS_VERSION_MINOR	12
-#define CODA_OSS_VERSION_PATCH	14
+#define CODA_OSS_VERSION_MAJOR	2023
+#define CODA_OSS_VERSION_MINOR	6
+#define CODA_OSS_VERSION_PATCH	5
 #define CODA_OSS_VERSION_BUILD	0
 #define CODA_OSS_VERSION CODA_OSS_MAKE_VERSION_MMPB(CODA_OSS_VERSION_MAJOR, CODA_OSS_VERSION_MINOR, CODA_OSS_VERSION_PATCH, CODA_OSS_VERSION_BUILD)
 
diff --git a/externals/coda-oss/modules/c++/mt/include/mt/RequestQueue.h b/externals/coda-oss/modules/c++/mt/include/mt/RequestQueue.h
index cb0d8201c7..ad33a53a14 100644
--- a/externals/coda-oss/modules/c++/mt/include/mt/RequestQueue.h
+++ b/externals/coda-oss/modules/c++/mt/include/mt/RequestQueue.h
@@ -97,13 +97,13 @@ struct RequestQueue
     }
 
     // Check to see if its empty
-    inline bool isEmpty()
+    bool isEmpty() const
     {
-        return (mRequestQueue.size() == 0);
+        return mRequestQueue.empty();
     }
 
     // Check the length
-    inline int length()
+    int length() const
     {
         return mRequestQueue.size();
     }
diff --git a/externals/coda-oss/modules/c++/net/source/URL.cpp b/externals/coda-oss/modules/c++/net/source/URL.cpp
index 881a4b8547..8791e0c6bd 100644
--- a/externals/coda-oss/modules/c++/net/source/URL.cpp
+++ b/externals/coda-oss/modules/c++/net/source/URL.cpp
@@ -161,7 +161,7 @@ bool net::URLParams::contains(std::string key) const
 net::URLParams::ParamValues& net::URLParams::get(std::string key)
 {
     net::URLParams::Params::iterator it = mParams.find(key);
-    if (it == mParams.end() || it->second.size() == 0)
+    if (it == mParams.end() || it->second.empty())
         throw except::NoSuchKeyException(Ctxt(key));
     return it->second;
 }
@@ -169,14 +169,14 @@ net::URLParams::ParamValues& net::URLParams::get(std::string key)
 const net::URLParams::ParamValues& net::URLParams::get(std::string key) const
 {
     net::URLParams::Params::const_iterator it = mParams.find(key);
-    if (it == mParams.end() || it->second.size() == 0)
+    if (it == mParams.end() || it->second.empty())
         throw except::NoSuchKeyException(Ctxt(key));
     return it->second;
 }
 std::string net::URLParams::getFirst(std::string key) const
 {
     net::URLParams::Params::const_iterator it = mParams.find(key);
-    if (it == mParams.end() || it->second.size() == 0)
+    if (it == mParams.end() || it->second.empty())
         throw except::NoSuchKeyException(Ctxt(key));
     return it->second.front();
 }
diff --git a/externals/coda-oss/modules/c++/polygon/include/polygon/Intersections.h b/externals/coda-oss/modules/c++/polygon/include/polygon/Intersections.h
index 7b63b69b84..d73ac1f6d0 100644
--- a/externals/coda-oss/modules/c++/polygon/include/polygon/Intersections.h
+++ b/externals/coda-oss/modules/c++/polygon/include/polygon/Intersections.h
@@ -27,6 +27,7 @@
 #include <cmath>
 
 #include <types/RowCol.h>
+#include <gsl/gsl.h>
 
 namespace polygon
 {
@@ -47,14 +48,13 @@ namespace polygon
  * square will have 1 pixel of its top edge missing.
  */
 template <typename PointT>
-class Intersections
+struct Intersections final
 {
-public:
     /*!
      * \class Intersection
      * \brief Represents an intersection
      */
-    struct Intersection
+    struct Intersection final
     {
         //! First (inclusive) column
         size_t first;
@@ -63,7 +63,7 @@ class Intersections
         size_t last;
 
         //! \return Number of columns
-        size_t length() const
+        size_t length() const noexcept
         {
             return last - first + 1;
         }
@@ -172,11 +172,10 @@ class Intersections
             types::RowCol<sys::SSize_T> offset)
     {
         std::vector<types::RowCol<PointT> > shiftedPoints(points);
-        for (size_t ii = 0; ii < shiftedPoints.size(); ++ii)
+        for (auto&& shiftedPoint : shiftedPoints)
         {
             // Get the polygon points with respect to the offset
-            shiftedPoints[ii].row -= offset.row;
-            shiftedPoints[ii].col -= offset.col;
+            shiftedPoint -= offset;
 
             // TODO: The original implementation did this (plus subtracted 0.5
             //       from each row and col which we're not doing here).
@@ -184,7 +183,7 @@ class Intersections
             //       right on a row, we skip drawing some rows
             //       (test_draw_polygon will illustrate this). I wonder if we
             //       could tweak the sl0 and sl1 logic to avoid this.
-            PointT& rowPoint(shiftedPoints[ii].row);
+            PointT& rowPoint(shiftedPoint.row);
             if (std::floor(rowPoint) == rowPoint)
             {
                 // Add small amount to move it off the scan line
@@ -195,7 +194,7 @@ class Intersections
         // We need to get all scanline intersections of polygon edges
         mIntersections.resize(dims.row);
 
-        const sys::SSize_T lastRow = static_cast<sys::SSize_T>(dims.row) - 1;
+        const auto lastRow = gsl::narrow<sys::SSize_T>(dims.row) - 1;
 
         for (size_t ii = 0; ii < shiftedPoints.size(); ++ii)
         {
@@ -256,9 +255,9 @@ class Intersections
             // that situation.
             for (sys::SSize_T row = sl0; row <= sl1; ++row)
             {
-                const PointT delt = row - r0;
-                const PointT sli = c0 + delt * dcdr;
-                mIntersections[row].push_back(sli);
+                const auto delt = static_cast<PointT>(row) - r0;
+                const auto sli = c0 + delt * dcdr;
+                mIntersections[gsl::narrow<size_t>(row)].push_back(sli);
             }
         }
 
@@ -273,6 +272,12 @@ class Intersections
             }
         }
     }
+    
+    // `const` member data means copy/move must be implemented
+    Intersections(const Intersections&) = delete;
+    Intersections& operator=(const Intersections&) = delete;
+    Intersections(Intersections&&) = delete;
+    Intersections& operator=(Intersections&&) = delete;
 
 private:
     const types::RowCol<size_t> mDims;
diff --git a/externals/coda-oss/modules/c++/sio.lite/source/FileHeader.cpp b/externals/coda-oss/modules/c++/sio.lite/source/FileHeader.cpp
index f0bf8d77fd..8a7c8a40fc 100644
--- a/externals/coda-oss/modules/c++/sio.lite/source/FileHeader.cpp
+++ b/externals/coda-oss/modules/c++/sio.lite/source/FileHeader.cpp
@@ -204,6 +204,7 @@ void sio::lite::FileHeader::addUserData(const std::string& field,
 void sio::lite::FileHeader::addUserData(const std::string& field, int data)
 {
     std::vector<sys::byte> vec;
+    vec.reserve(sizeof(int));
     char* cData = (char*)&data;
     for (int i = 0, size = sizeof(int); i < size; ++i)
         vec.push_back((sys::byte)cData[i]);
diff --git a/externals/coda-oss/modules/c++/str/include/str/Format.h b/externals/coda-oss/modules/c++/str/include/str/Format.h
index b6a6be4263..2409438076 100644
--- a/externals/coda-oss/modules/c++/str/include/str/Format.h
+++ b/externals/coda-oss/modules/c++/str/include/str/Format.h
@@ -47,7 +47,7 @@ struct CODA_OSS_API Format final
         return mString;
     }
 
-    operator std::string& ()
+    operator std::string& () noexcept
     {
         return mString;
     }
diff --git a/externals/coda-oss/modules/c++/str/include/str/Manip.h b/externals/coda-oss/modules/c++/str/include/str/Manip.h
index 9da33183ff..1f97ac941e 100644
--- a/externals/coda-oss/modules/c++/str/include/str/Manip.h
+++ b/externals/coda-oss/modules/c++/str/include/str/Manip.h
@@ -194,9 +194,9 @@ inline std::string join(const std::vector<T>& toks, const std::string& with)
     if (toks.empty())
         return "";
 
-    const auto len = static_cast<int>(toks.size());
+    const auto len = toks.size();
     std::ostringstream oss;
-    int i = 0;
+    size_t i = 0;
     for (; i < len - 1; i++)
     {
         oss << str::toString(toks[i]) << with;
diff --git a/externals/coda-oss/modules/c++/str/include/str/Tokenizer.h b/externals/coda-oss/modules/c++/str/include/str/Tokenizer.h
index baa5028574..4433b1fdc4 100644
--- a/externals/coda-oss/modules/c++/str/include/str/Tokenizer.h
+++ b/externals/coda-oss/modules/c++/str/include/str/Tokenizer.h
@@ -65,7 +65,7 @@ class Tokenizer
      * Method to return the resultant vector 
      * \return The vector that was created by the tokenizer
      */
-    operator Tokenizer::Tokens& ()
+    operator Tokenizer::Tokens& () noexcept
     {
         return vec;
     }
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/AtomicCounterCpp11.h b/externals/coda-oss/modules/c++/sys/include/sys/AtomicCounterCpp11.h
index 79979f2835..ce785869fe 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/AtomicCounterCpp11.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/AtomicCounterCpp11.h
@@ -39,24 +39,24 @@ struct AtomicCounterImplCpp11 final
 {
     using ValueType = size_t ;
 
-    explicit AtomicCounterImplCpp11(ValueType initialValue) :
+    explicit AtomicCounterImplCpp11(ValueType initialValue) noexcept :
         mValue(initialValue)
     {
     }
 
-    ValueType getThenIncrement()
+    ValueType getThenIncrement() noexcept
     {
         // https://en.cppreference.com/w/cpp/atomic/atomic/fetch_add
         return mValue.fetch_add(1);
     }
 
-    ValueType getThenDecrement()
+    ValueType getThenDecrement() noexcept
     {
         // https://en.cppreference.com/w/cpp/atomic/atomic/fetch_sub
         return mValue.fetch_sub(1);
     }
 
-    ValueType get() const
+    ValueType get() const noexcept
     {
         // https://en.cppreference.com/w/cpp/atomic/atomic/load
         return mValue.load();
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/ByteSwap.h b/externals/coda-oss/modules/c++/sys/include/sys/ByteSwap.h
index d8145dcced..6b135288d8 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/ByteSwap.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/ByteSwap.h
@@ -21,20 +21,24 @@
  *
  */
 
+#pragma once 
 #ifndef CODA_OSS_sys_ByteSwap_h_INCLUDED_
 #define CODA_OSS_sys_ByteSwap_h_INCLUDED_
-#pragma once
 
 #include <stdint.h>
 #include <stdlib.h>
 
 #include <coda_oss/span.h>
 #include <coda_oss/cstddef.h>
+#include <type_traits>
+#include <stdexcept>
+#include <complex>
 
 #include "config/Exports.h"
 
 #include "ByteSwapValue.h"
 #include "Runnable.h"
+#include "SysInt.h"
 
 namespace sys
 {
@@ -50,6 +54,90 @@ namespace sys
 coda_oss::span<const coda_oss::byte> CODA_OSS_API byteSwap(coda_oss::span<coda_oss::byte>buffer, size_t elemSize);
 void CODA_OSS_API byteSwap(void* buffer, size_t elemSize, size_t numElems);
 
+// If the caller has given us bytes, assume she knows what she's doing; i.e., don't check sizeof(T)
+template<typename TByte>
+inline void byteSwap_(TByte* buffer, size_t elemSize, size_t numElems)
+{
+    void* const buffer_ = buffer;
+    byteSwap(buffer_, elemSize, numElems);
+}
+inline void byteSwap(coda_oss::byte* buffer, size_t elemSize, size_t numElems)
+{
+    return byteSwap_(buffer, elemSize, numElems);
+}
+inline void byteSwap(byte* buffer, size_t elemSize, size_t numElems)
+{
+    return byteSwap_(buffer, elemSize, numElems);
+}
+inline void byteSwap(ubyte* buffer, size_t elemSize, size_t numElems)
+{
+    return byteSwap_(buffer, elemSize, numElems);
+}
+
+namespace details
+{
+template <typename T>
+inline void check_elemSize(size_t elemSize)
+{
+    static_assert(is_byte_swappable<T>(), "T should not be a 'struct'");
+    if (sizeof(T) != elemSize)
+    {
+        throw std::invalid_argument("'elemSize' != sizeof(T)");
+    }
+}
+
+// Repackage into a span<T>; the size is 2* because for byte-swapping
+// we want to look at this as an array of `T`, not `std::complex<T>`.
+template <typename T>
+inline auto make_span(coda_oss::span<const std::complex<T>> s)
+{
+    const void* const p_ = s.data();
+    auto const p = static_cast<const T*>(p_);
+    const auto sz = s.size() * 2;  // real and imag
+    return sys::make_span(p, sz);
+}
+template<typename T>
+inline auto make_span(coda_oss::span<std::complex<T>> s)
+{
+    void* const p_ = s.data();
+    auto const p = static_cast<T*>(p_);
+    const auto sz = s.size() * 2;  // real and imag
+    return sys::make_span(p, sz);
+}
+
+}
+
+// Otherwise, we can sanity-check the `elemSize` parameter
+template <typename T>
+inline void byteSwap(T* buffer, size_t elemSize, size_t numElems)
+{
+    details::check_elemSize<T>(elemSize);
+    void* const buffer_ = buffer;
+    byteSwap(buffer_, elemSize, numElems);
+}
+template <typename T>
+inline void byteSwap(std::complex<T>* buffer, size_t elemSize, size_t numElems) // dont't want `T` as `std::complex<...>`
+{
+    details::check_elemSize<T>(elemSize);
+    void* const buffer_ = buffer;
+    byteSwap(buffer_, elemSize, numElems);
+}
+
+template <typename T>
+inline auto byteSwap(coda_oss::span<T> buffer)
+{
+    static_assert(!std::is_const<T>::value, "T cannot be 'const'");
+    static_assert(details::is_byte_swappable<T>(), "T should not be a 'struct'");
+    return byteSwap(as_writable_bytes(buffer), sizeof(T));
+}
+
+// Take care of treating std::complex<T> as T[]
+template <typename T>
+inline auto byteSwap(coda_oss::span<std::complex<T>> buffer)
+{
+    return byteSwap(details::make_span(buffer));
+}
+
 /*!
  *  Swap bytes into output buffer.  Note that a complex pixel
  *  is equivalent to two floats so elemSize and numElems
@@ -64,9 +152,101 @@ coda_oss::span<const coda_oss::byte> CODA_OSS_API byteSwap(coda_oss::span<const
          size_t elemSize, coda_oss::span<coda_oss::byte> outputBuffer);
 void CODA_OSS_API byteSwap(const void* buffer, size_t elemSize, size_t numElems, void* outputBuffer);
 
+// If the caller has given us bytes, assume she knows what she's doing; i.e., don't check sizeof(T)
+template<typename TByte, typename U>
+inline void byteSwap_(const TByte* buffer, size_t elemSize, size_t numElems, U* outputBuffer)
+{
+    const void* const buffer_ = buffer;
+    void* const outputBuffer_ = outputBuffer;
+    byteSwap(buffer_, elemSize, numElems, outputBuffer_);
+}
+template<typename U>
+inline void byteSwap(const coda_oss::byte* buffer, size_t elemSize, size_t numElems, U* outputBuffer)
+{
+    byteSwap_(buffer, elemSize, numElems, outputBuffer);
+}
+template <typename U>
+inline void byteSwap(const byte* buffer, size_t elemSize, size_t numElems, U* outputBuffer)
+{
+    byteSwap_(buffer, elemSize, numElems, outputBuffer);
+}
+template <typename U>
+inline void byteSwap(const ubyte* buffer, size_t elemSize, size_t numElems, U* outputBuffer)
+{
+    byteSwap_(buffer, elemSize, numElems, outputBuffer);
+}
+
+// Otherwise, we can sanity-check the `elemSize` parameter
+template <typename T, typename U>
+inline void byteSwap(const T* buffer, size_t elemSize, size_t numElems, U* outputBuffer)
+{
+    details::check_elemSize<T>(elemSize); 
+    const void* const buffer_ = buffer;
+    void* const outputBuffer_ = outputBuffer;
+    byteSwap(buffer_, elemSize, numElems, outputBuffer_);
+}
+template <typename T, typename U>
+inline void byteSwap(const std::complex<T>* buffer, size_t elemSize, size_t numElems, U* outputBuffer) // dont't want `T` as `std::complex<...>`
+{
+    details::check_elemSize<T>(elemSize);
+    const void* const buffer_ = buffer;
+    void* const outputBuffer_ = outputBuffer;
+    byteSwap(buffer_, elemSize, numElems, outputBuffer_);
+}
+
+template <typename T>
+inline auto byteSwap(coda_oss::span<const T> buffer, coda_oss::span<coda_oss::byte> outputBuffer)
+{
+    static_assert(details::is_byte_swappable<T>(), "T should not be a 'struct'");
+    return byteSwap(as_bytes(buffer), sizeof(T), outputBuffer);
+}
+// Take care of treating std::complex<T> as T[]
+template <typename T>
+inline auto byteSwap(coda_oss::span<const std::complex<T>> buffer, coda_oss::span<coda_oss::byte> outputBuffer)
+{
+    return byteSwap(details::make_span(buffer), outputBuffer);
+}
+
+template <typename T>
+inline auto byteSwap(coda_oss::span<const T> buffer)
+{
+    std::vector<coda_oss::byte> retval(buffer.size_bytes());
+    std::ignore = byteSwap(buffer, make_span(retval));
+    return retval;
+}
+// Take care of treating std::complex<T> as T[]
+template <typename T>
+inline auto byteSwap(coda_oss::span<const std::complex<T>> buffer)
+{
+    return byteSwap(details::make_span(buffer));
+}
+
+// With buffer byte-swap now in place, we can safely byte-swap std::complex<T>.
+// This signature is from ByteSwapValue.h
+template <typename T>
+inline auto byteSwapValue(std::complex<T> z)
+{
+    // C++ mandates that `std::complex<T>` be the same as `T cx[2]`; that is
+    // the structure is contiguous. https://en.cppreference.com/w/cpp/numeric/complex
+    const auto& z_ = reinterpret_cast<T(&)[2]>(z);    
+    return byteSwap(make_span(z_));
+}
+template<typename T>
+inline auto byteSwap(std::complex<T> val)
+{
+    const auto bytes = byteSwapValue(val);
+    assert(bytes.size() == sizeof(val));
+
+    const void* const pBytes = bytes.data();
+    auto const pRetVal = static_cast<const std::complex<T>*>(pBytes);
+    return *pRetVal;
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
 struct ByteSwapRunnable final : public sys::Runnable
 {
-    ByteSwapRunnable(void* buffer, size_t elemSize, size_t startElement, size_t numElements) :
+    ByteSwapRunnable(void* buffer, size_t elemSize, size_t startElement, size_t numElements) noexcept :
         mBuffer(static_cast<coda_oss::byte*>(buffer) + startElement * elemSize),
         mElemSize(elemSize), mNumElements(numElements)
     {
@@ -90,7 +270,7 @@ struct ByteSwapRunnable final : public sys::Runnable
 
 struct ByteSwapCopyRunnable final : public sys::Runnable
 {
-    ByteSwapCopyRunnable(const void* buffer, size_t elemSize, size_t startElement, size_t numElements, void* outputBuffer) :
+    ByteSwapCopyRunnable(const void* buffer, size_t elemSize, size_t startElement, size_t numElements, void* outputBuffer) noexcept :
         mBuffer(static_cast<const coda_oss::byte*>(buffer) + startElement * elemSize),
         mElemSize(elemSize), mNumElements(numElements),
          mOutputBuffer(static_cast<coda_oss::byte*>(outputBuffer) + startElement * elemSize)
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/ByteSwapValue.h b/externals/coda-oss/modules/c++/sys/include/sys/ByteSwapValue.h
index 57cffe3f3b..c36c4428e4 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/ByteSwapValue.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/ByteSwapValue.h
@@ -21,9 +21,9 @@
  *
  */
 
+#pragma once
 #ifndef CODA_OSS_sys_ByteSwapValue_h_INCLUDED_
 #define CODA_OSS_sys_ByteSwapValue_h_INCLUDED_
-#pragma once
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -37,19 +37,12 @@
 #include <vector>
 #include <array>
 #include <stdexcept>
+#include <new>
 
 #include "config/Exports.h"
 
 #include "Span.h"
 
-#include <type_traits>
-#include <coda_oss/span.h>
-#include <coda_oss/cstddef.h>
-#include <tuple>
-#include <vector>
-#include <array>
-#include <stdexcept>
-
 namespace sys
 {
     /*!
@@ -65,6 +58,20 @@ namespace sys
 
     namespace details
     {
+    // "cast" a single value to bytes
+    template <typename T>
+    inline auto as_bytes(const T& v) noexcept
+    {
+        static_assert(!std::is_compound<T>::value, "T cannot be a 'struct'");
+        return sys::as_bytes(&v, 1);
+    }
+    template <typename T>
+    inline auto as_writable_bytes(T& v) noexcept
+    {
+        static_assert(!std::is_compound<T>::value, "T cannot be a 'struct'");
+        return sys::as_writable_bytes(&v, 1);
+    }
+
     template <typename TUInt>
     inline auto swapUIntBytes(coda_oss::span<const coda_oss::byte> inBytes, coda_oss::span<coda_oss::byte> outBytes,
         std::nothrow_t) noexcept
@@ -81,7 +88,7 @@ namespace sys
         *pOut = coda_oss::byteswap(*pIn); // at long last, swap the bytes
 
         // Give the raw byte-swapped bytes back to the caller for easy serialization
-        return as_bytes(pOut);
+        return as_bytes(*pOut);
     }
     template <typename TUInt>
     inline auto swapUIntBytes(coda_oss::span<const coda_oss::byte> inBytes, coda_oss::span<coda_oss::byte> outBytes)
@@ -136,33 +143,32 @@ namespace sys
     * Returns the raw byte-swapped bytes for easy serialization.
     */
     template <typename T>
-    inline auto swapBytes(coda_oss::span<const coda_oss::byte> inBytes, coda_oss::span<coda_oss::byte> outBytes)
+    inline auto byteSwapValue(coda_oss::span<const coda_oss::byte> inBytes, coda_oss::span<coda_oss::byte> outBytes)
     {
         static_assert(details::is_byte_swappable<T>(), "T should not be a 'struct'");
         return details::swapBytes<sizeof(T)>(inBytes, outBytes);
     }
     template <typename T>
-    inline auto swapBytes(T in, coda_oss::span<coda_oss::byte> outBytes)
+    inline auto byteSwapValue(T in, coda_oss::span<coda_oss::byte> outBytes)
     {
-        return swapBytes<T>(as_bytes(in), outBytes);
+        return byteSwapValue<T>(details::as_bytes(in), outBytes);
     }
     template <typename T>
-    inline auto swapBytes(T in)
+    inline auto byteSwapValue(T in)
     {
-        std::vector<coda_oss::byte> retval;
-        retval.resize(sizeof(T));
-        std::ignore = swapBytes(in, make_span(retval));
+        std::vector<coda_oss::byte> retval(sizeof(T));
+        std::ignore = byteSwapValue(in, make_span(retval));
         return retval;
     }
 
     // Reverse the above: turn `span<byte>` back to T after byte-swapping
     template <typename T>
-    inline auto swapBytes(coda_oss::span<const coda_oss::byte> in)
+    inline auto byteSwapValue(coda_oss::span<const coda_oss::byte> in)
     {
         // Don't want to cast the swapped bytes in `in` to T* as they might not be valid;
         // e.g., a byte-swapped `float` could be garbage.
         T retval;
-        swapBytes<T>(in, as_writable_bytes(retval));
+        byteSwapValue<T>(in, details::as_writable_bytes(retval));
         return retval;
     }
 
@@ -189,7 +195,7 @@ namespace sys
     template <typename T> inline T byteSwap(T val)
     {
         T out;
-        std::ignore = swapBytes(val, as_writable_bytes(out));
+        std::ignore = byteSwapValue(val, details::as_writable_bytes(out));
         return out;
     }
 }
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/ConditionVarInterface.h b/externals/coda-oss/modules/c++/sys/include/sys/ConditionVarInterface.h
index 96172c8bcb..8d6f762f50 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/ConditionVarInterface.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/ConditionVarInterface.h
@@ -68,8 +68,8 @@ struct CODA_OSS_API ConditionVarInterface
      *  a lock, but this class will STILL delete it.
      *
      */
-    explicit ConditionVarInterface(Mutex *, bool = false) {}
-    explicit ConditionVarInterface(Mutex&) { }
+    explicit ConditionVarInterface(Mutex *, bool = false) noexcept {}
+    explicit ConditionVarInterface(Mutex&) noexcept { }
 
     virtual ~ConditionVarInterface() = default;
 
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/Conf.h b/externals/coda-oss/modules/c++/sys/include/sys/Conf.h
index df36708bb4..111e5f9c86 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/Conf.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/Conf.h
@@ -76,7 +76,7 @@
 #include "str/Format.h"
 #include "sys/TimeStamp.h"
 #include "sys/ByteSwap.h"
-
+#include "sys/SysInt.h"
 
 /*  Dance around the compiler to figure out  */
 /*  if we have access to function macro...   */
@@ -105,22 +105,6 @@
 #   define NativeLayer_func__ ""
 #endif
 
-
-namespace sys
-{
-    typedef char              byte;
-    typedef unsigned char     ubyte;
-    typedef uint8_t            Uint8_T;
-    typedef uint16_t           Uint16_T;
-    typedef uint32_t           Uint32_T;
-    typedef uint64_t           Uint64_T;
-    typedef size_t             Size_T;
-    typedef int8_t             Int8_T;
-    typedef int16_t            Int16_T;
-    typedef int32_t            Int32_T;
-    typedef int64_t            Int64_T;
-}
-
 #ifdef _WIN32
 #  include <malloc.h>
 #  include <windows.h>
@@ -247,7 +231,7 @@ namespace sys
      *
      *  \param p A pointer to the data allocated using alignedAlloc
      */
-    inline void alignedFree(void* p)
+    inline void alignedFree(void* p) noexcept
     {
 #ifdef _WIN32
         _aligned_free(p);
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/DateTime.h b/externals/coda-oss/modules/c++/sys/include/sys/DateTime.h
index 5ca7db4459..d238eda6d1 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/DateTime.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/DateTime.h
@@ -155,32 +155,32 @@ class CODA_OSS_API DateTime
      * @return true if comparison holds, false otherwise.
      */
     //@{
-    bool operator<(const DateTime& rhs) const
+    bool operator<(const DateTime& rhs) const noexcept
     {
         return (mTimeInMillis < rhs.mTimeInMillis);
     }
 
-    bool operator<=(const DateTime& rhs) const
+    bool operator<=(const DateTime& rhs) const noexcept
     {
         return (mTimeInMillis <= rhs.mTimeInMillis);
     }
 
-    bool operator>(const DateTime& rhs) const
+    bool operator>(const DateTime& rhs) const noexcept
     {
         return (mTimeInMillis > rhs.mTimeInMillis);
     }
 
-    bool operator>=(const DateTime& rhs) const
+    bool operator>=(const DateTime& rhs) const noexcept
     {
         return (mTimeInMillis >= rhs.mTimeInMillis);
     }
 
-    bool operator==(const DateTime& rhs) const
+    bool operator==(const DateTime& rhs) const noexcept
     {
         return (mTimeInMillis == rhs.mTimeInMillis);
     }
 
-    bool operator!=(const DateTime& rhs) const
+    bool operator!=(const DateTime& rhs) const noexcept
     {
         return !operator==(rhs);
     }
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/Err.h b/externals/coda-oss/modules/c++/sys/include/sys/Err.h
index c7163f35bd..4c3b37c509 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/Err.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/Err.h
@@ -62,7 +62,7 @@ struct CODA_OSS_API Err
      * Copy constructor
      * \param err The err to take
      */
-    Err(const Err& err)
+    Err(const Err& err) noexcept
     {
         mErrId = err.getErrID();
     }
@@ -82,7 +82,7 @@ struct CODA_OSS_API Err
      *  Assignment operator
      *  \param err The err to take
      */
-    Err& operator=(const Err& err)
+    Err& operator=(const Err& err) noexcept
     {
         if (&err != this)
         {
@@ -115,7 +115,7 @@ struct CODA_OSS_API Err
     //!  Return the last error
     virtual int getLast() const;
 
-    int getErrID() const { return mErrId; }
+    int getErrID() const noexcept { return mErrId; }
 
 protected:
 
@@ -158,7 +158,7 @@ struct SocketErr : public Err
      *  \param err The err to take
      *
      */
-    SocketErr& operator=(const SocketErr& err)
+    SocketErr& operator=(const SocketErr& err) noexcept
     {
         if (&err != this)
         {
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/LocalDateTime.h b/externals/coda-oss/modules/c++/sys/include/sys/LocalDateTime.h
index 5effbcaa69..a264d92738 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/LocalDateTime.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/LocalDateTime.h
@@ -78,7 +78,7 @@ class CODA_OSS_API LocalDateTime : public DateTime
     LocalDateTime(const std::string& time, const std::string& format);
 
     //! Return the Daylight Savings Time flag (true = on, false = off)
-    bool getDST() const { return mDST == 1; }
+    bool getDST() const noexcept { return mDST == 1; }
 
     //! Set the Daylight Savings Time flag (true = on, false = off)
     void setDST(bool isDST);
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/MutexCpp11.h b/externals/coda-oss/modules/c++/sys/include/sys/MutexCpp11.h
index b95738d349..e10ff54205 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/MutexCpp11.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/MutexCpp11.h
@@ -66,7 +66,7 @@ struct MutexCpp11 final : public MutexInterface
      *  Return the type name.  This function is essentially free,
      *  because it is static RTTI.
      */
-    const char* getNativeType() const
+    const char* getNativeType() const noexcept
     {
         return typeid(mNative).name();
     }
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/MutexWin32.h b/externals/coda-oss/modules/c++/sys/include/sys/MutexWin32.h
index adc3ac2d38..aa6b4906a3 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/MutexWin32.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/MutexWin32.h
@@ -64,7 +64,7 @@ class CODA_OSS_API MutexWin32 : public MutexInterface
      *  Return the type name.  This function is essentially free,
      *  because it is static RTTI.
      */
-    const char* getNativeType() const
+    const char* getNativeType() const noexcept
     {
         return typeid(mNative).name();
     }
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/OSWin32.h b/externals/coda-oss/modules/c++/sys/include/sys/OSWin32.h
index 3b7dcd3ced..7fc5fdf972 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/OSWin32.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/OSWin32.h
@@ -59,7 +59,7 @@ struct CODA_OSS_API OSWin32 final : public AbstractOS
      *  For unix it will be one slash /
      *  \return The path delimiter
      */
-    virtual const char* getDelimiter() const
+    const char* getDelimiter() const noexcept override
     {
         return "\\";
     }
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/Span.h b/externals/coda-oss/modules/c++/sys/include/sys/Span.h
index 23b72d02c1..bf24e81c7e 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/Span.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/Span.h
@@ -21,14 +21,15 @@
  *
  */
 
+#pragma once 
 #ifndef CODA_OSS_sys_Span_h_INCLUDED_
 #define CODA_OSS_sys_Span_h_INCLUDED_
-#pragma once
 
 #include <coda_oss/span.h>
 #include <coda_oss/cstddef.h>
 #include <vector>
 #include <array>
+#include <type_traits>
 
 namespace sys // not "mem", it depends on sys.
 {
@@ -128,6 +129,22 @@ inline auto make_span(T (&a)[N]) noexcept
 
 // Calling as_bytes() or as_writable_bytes() requires a span, which as
 // noted above is a nuisance to create w/o C++17
+template <typename T>
+inline auto as_bytes(coda_oss::span<const T> s) noexcept
+{
+    return coda_oss::as_bytes(s);
+}
+template <typename T>
+inline auto as_bytes(coda_oss::span<T> s) noexcept
+{
+    return coda_oss::as_bytes(s);
+}
+template <typename T>
+inline auto as_writable_bytes(coda_oss::span<T> s) noexcept
+{
+    return coda_oss::as_writable_bytes(s);
+}
+
 template <typename T>
 inline auto as_bytes(const T* ptr, size_t sz) noexcept
 {
@@ -136,6 +153,7 @@ inline auto as_bytes(const T* ptr, size_t sz) noexcept
 template <typename T>
 inline auto as_writable_bytes(T* ptr, size_t sz) noexcept
 {
+    static_assert(!std::is_const<T>::value, "T cannot be 'const'");
     return coda_oss::as_writable_bytes(make_writable_span(ptr, sz));
 }
 
@@ -172,17 +190,5 @@ inline auto as_writable_bytes(T (&a)[N]) noexcept
     return as_writable_bytes(a, N);
 }
 
-// "cast" a single value to bytes
-template <typename T>
-inline auto as_bytes(const T& v) noexcept
-{
-    return as_bytes(&v, 1);
-}
-template <typename T>
-inline auto as_writable_bytes(T& v) noexcept
-{
-    return as_writable_bytes(&v, 1);
-}
-
 }
 #endif // CODA_OSS_sys_Span_h_INCLUDED_
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/SysInt.h b/externals/coda-oss/modules/c++/sys/include/sys/SysInt.h
new file mode 100644
index 0000000000..a25f76d1fa
--- /dev/null
+++ b/externals/coda-oss/modules/c++/sys/include/sys/SysInt.h
@@ -0,0 +1,45 @@
+/* =========================================================================
+ * This file is part of sys-c++
+ * =========================================================================
+ *
+ * (C) Copyright 2004 - 2014, MDA Information Systems LLC
+ * (C) Copyright 2023, Maxar Technologies, Inc.
+ *
+ * sys-c++ is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; If not,
+ * see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+#pragma once
+#ifndef CODA_OSS_sys_SysInt_h_INCLUDED_
+#define CODA_OSS_sys_SysInt_h_INCLUDED_
+
+#include <stdint.h>
+
+namespace sys
+{
+    typedef char              byte;
+    typedef unsigned char     ubyte;
+    typedef uint8_t            Uint8_T;
+    typedef uint16_t           Uint16_T;
+    typedef uint32_t           Uint32_T;
+    typedef uint64_t           Uint64_T;
+    typedef size_t             Size_T;
+    typedef int8_t             Int8_T;
+    typedef int16_t            Int16_T;
+    typedef int32_t            Int32_T;
+    typedef int64_t            Int64_T;
+}
+
+#endif // CODA_OSS_sys_SysInt_h_INCLUDED_
diff --git a/externals/coda-oss/modules/c++/sys/include/sys/TimeStamp.h b/externals/coda-oss/modules/c++/sys/include/sys/TimeStamp.h
index 8d8c72281f..a04207938b 100644
--- a/externals/coda-oss/modules/c++/sys/include/sys/TimeStamp.h
+++ b/externals/coda-oss/modules/c++/sys/include/sys/TimeStamp.h
@@ -54,7 +54,7 @@ struct TimeStamp final
      *  \param is24HourTime Optional specifier for military time
      */
     TimeStamp() = default;
-    TimeStamp(bool is24HourTime) : m24HourTime(is24HourTime)
+    TimeStamp(bool is24HourTime) noexcept : m24HourTime(is24HourTime)
     {
     }
     ~TimeStamp() = default;
@@ -84,7 +84,7 @@ struct TimeStamp final
      *  Sets up string in desired format
      *  \return The string format for printing
      */
-    const char* getFormat() const
+    const char* getFormat() const noexcept
     {
         if (m24HourTime)
         {
diff --git a/externals/coda-oss/modules/c++/sys/source/Conf.cpp b/externals/coda-oss/modules/c++/sys/source/Conf.cpp
index bf29dd69ba..326b3cac71 100644
--- a/externals/coda-oss/modules/c++/sys/source/Conf.cpp
+++ b/externals/coda-oss/modules/c++/sys/source/Conf.cpp
@@ -132,40 +132,42 @@ bool sys::isLittleEndianSystem()
  *  \param numElems
  */
 template <typename TUInt>
-inline void byteSwap_n_(void *buffer_, size_t numElems)
+inline auto byteSwap(coda_oss::span<TUInt> buffer)
 {
     static_assert(std::is_unsigned<TUInt>::value, "TUInt must be 'unsigned'");
-    const auto buffer = sys::make_span<TUInt>(buffer_, numElems);
-    assert(buffer.size_bytes() == sizeof(TUInt) * numElems);
-
     for (auto& v : buffer)
     {
         v = sys::byteSwap(v);
     }
+    return sys::as_bytes(buffer);
 }
 template <typename TUInt>
-inline void byteSwap_n(void *buffer, size_t elemSize, size_t numElems)
+inline auto byteSwap_n_(coda_oss::span<coda_oss::byte> buffer_)
+{
+    const auto buffer = sys::make_span<TUInt>(buffer_.data(), buffer_.size_bytes() / sizeof(TUInt));
+    assert(buffer.size_bytes() == buffer_.size_bytes());
+    return byteSwap(buffer);
+}
+template <typename TUInt>
+inline auto byteSwap_n(coda_oss::span<coda_oss::byte> buffer, size_t elemSize)
 {
     if (sizeof(TUInt) != elemSize)
     {
         throw std::invalid_argument("'elemSize' != sizeof(TUInt)");
     }
-    byteSwap_n_<TUInt>(buffer, numElems);
+    return byteSwap_n_<TUInt>(buffer);
 }
-void sys::byteSwap(void* buffer, size_t elemSize, size_t numElems)
+static coda_oss::span<const coda_oss::byte> byteSwap(coda_oss::span<coda_oss::byte> buffer, size_t elemSize, size_t numElems)
 {
-    if ((buffer == nullptr) || (elemSize < 2) || (numElems == 0))
-        return;
-
     switch (elemSize)
     {
-        case sizeof(uint16_t): return byteSwap_n<uint16_t>(buffer, elemSize, numElems);
-        case sizeof(uint32_t): return byteSwap_n<uint32_t>(buffer, elemSize, numElems);
-        case sizeof(uint64_t): return byteSwap_n<uint64_t>(buffer, elemSize, numElems);
+        case sizeof(uint16_t): return byteSwap_n<uint16_t>(buffer, elemSize);
+        case sizeof(uint32_t): return byteSwap_n<uint32_t>(buffer, elemSize);
+        case sizeof(uint64_t): return byteSwap_n<uint64_t>(buffer, elemSize);
         default: break;
     }
-    
-    auto const bufferPtr = static_cast<coda_oss::byte*>(buffer);
+
+    auto const bufferPtr = buffer.data();
     const auto half = elemSize >> 1;
     size_t offset = 0, innerOff = 0, innerSwap = 0;
     for (size_t i = 0; i < numElems; ++i, offset += elemSize)
@@ -178,10 +180,21 @@ void sys::byteSwap(void* buffer, size_t elemSize, size_t numElems)
             std::swap(bufferPtr[innerOff], bufferPtr[innerSwap]);
         }
     }
+
+    return sys::make_const_span(buffer);
+}
+void sys::byteSwap(void* buffer_, size_t elemSize, size_t numElems)
+{
+    if ((buffer_ == nullptr) || (elemSize < 2) || (numElems == 0))
+        return;
+
+    auto const pBytes = static_cast<coda_oss::byte*>(buffer_);
+    const coda_oss::span<coda_oss::byte> buffer(pBytes, elemSize * numElems);
+    std::ignore = ::byteSwap(buffer, elemSize, numElems);
 }
 coda_oss::span<const coda_oss::byte> sys::byteSwap(coda_oss::span<coda_oss::byte> buffer, size_t elemSize)
 {
-    if ((buffer.size() == 0) || (elemSize < 2))
+    if ((buffer.empty()) || (elemSize < 2))
         return sys::make_const_span(buffer);
 
     size_t const numElems = buffer.size() / elemSize;
@@ -189,9 +202,8 @@ coda_oss::span<const coda_oss::byte> sys::byteSwap(coda_oss::span<coda_oss::byte
     {
         throw std::invalid_argument("'buffer' is not a multiple of 'elemSize'");
     }
-    
-    byteSwap(buffer.data(), elemSize, numElems);
-    return sys::make_const_span(buffer);
+
+    return ::byteSwap(buffer, elemSize, numElems);
 }
 
     /*!
@@ -205,45 +217,52 @@ coda_oss::span<const coda_oss::byte> sys::byteSwap(coda_oss::span<coda_oss::byte
  *  \param[out] outputBuffer buffer to write swapped elements to
  */
 template <typename TUInt>
-inline void byteSwap_n_(const void *buffer_, size_t numElems, void *outputBuffer_)
+inline auto byteSwap_n_(coda_oss::span<const TUInt> buffer, coda_oss::span<coda_oss::byte> outputBuffer_)
 {
     static_assert(std::is_unsigned<TUInt>::value, "TUInt must be 'unsigned'");
 
-    const auto buffer = sys::make_span<TUInt>(buffer_, numElems);
-    assert(buffer.size_bytes() == sizeof(TUInt) * numElems);
-    const auto outputBuffer = sys::make_span<TUInt>(outputBuffer_, numElems);
+    assert(buffer.size_bytes() == outputBuffer_.size());
+    void* pOutputBuffer = outputBuffer_.data();
+    const auto outputBuffer = sys::make_span<TUInt>(pOutputBuffer, buffer.size());
+    assert(buffer.size_bytes() == outputBuffer.size_bytes());
 
     const auto byteSwap = [](const auto& v) { return sys::byteSwap(v); };
     std::transform(buffer.begin(), buffer.end(), outputBuffer.begin(), byteSwap);
+
+    return sys::as_bytes(outputBuffer);
 }
 template <typename TUInt>
-inline void byteSwap_n(const void *buffer, size_t elemSize, size_t numElems, void *outputBuffer)
+inline auto byteSwap_n(coda_oss::span<const coda_oss::byte> buffer_, size_t elemSize, coda_oss::span<coda_oss::byte> outputBuffer)
 {
     if (sizeof(TUInt) != elemSize)
     {
         throw std::invalid_argument("'elemSize' != sizeof(TUInt)");
     }
-    byteSwap_n_<TUInt>(buffer, numElems, outputBuffer);
+
+    const auto buffer = sys::make_span<TUInt>(buffer_.data(), buffer_.size_bytes() / sizeof(TUInt));
+    assert(buffer.size_bytes() == buffer_.size_bytes());
+    return byteSwap_n_<TUInt>(buffer,  outputBuffer);
 }
-void sys::byteSwap(const void* buffer, size_t elemSize, size_t numElems, void* outputBuffer)
-{
-    if ((numElems == 0) || (buffer == nullptr) || (outputBuffer == nullptr))
-    {
-        return;
-    }
 
+static auto byteSwap(coda_oss::span<const coda_oss::byte> buffer,
+                      size_t elemSize, size_t numElems,
+                      coda_oss::span<coda_oss::byte> outputBuffer)
+{
+    auto const bufferPtr = buffer.data();
+    auto const outputBufferPtr = outputBuffer.data();
     switch (elemSize)
     {
-        case 1: std::ignore = memcpy(outputBuffer, buffer, elemSize * numElems); return;
-        case 2: return byteSwap_n<uint16_t>(buffer, elemSize, numElems, outputBuffer);
-        case 4: return byteSwap_n<uint32_t>(buffer, elemSize, numElems, outputBuffer);
-        case 8: return byteSwap_n<uint64_t>(buffer, elemSize, numElems, outputBuffer);
+        case 1:
+        {
+            std::ignore = memcpy(outputBufferPtr, bufferPtr, elemSize * numElems);
+            return sys::make_const_span(outputBuffer);
+        }
+        case 2: return byteSwap_n<uint16_t>(buffer, elemSize, outputBuffer);
+        case 4: return byteSwap_n<uint32_t>(buffer, elemSize, outputBuffer);
+        case 8: return byteSwap_n<uint64_t>(buffer, elemSize, outputBuffer);
         default: break;
     }
 
-    auto const bufferPtr = static_cast<const coda_oss::byte*>(buffer);
-    auto const outputBufferPtr = static_cast<coda_oss::byte*>(outputBuffer);
-
     const auto half = elemSize >> 1;
     size_t offset = 0;
     for (size_t ii = 0; ii < numElems; ++ii, offset += elemSize)
@@ -257,11 +276,29 @@ void sys::byteSwap(const void* buffer, size_t elemSize, size_t numElems, void* o
             outputBufferPtr[innerSwap] = bufferPtr[innerOff];
         }
     }
+
+    return sys::make_const_span(outputBuffer);
+}
+
+void sys::byteSwap(const void* buffer_, size_t elemSize, size_t numElems, void* outputBuffer_)
+{
+    if ((numElems == 0) || (buffer_ == nullptr) || (outputBuffer_ == nullptr))
+    {
+        return;
+    }
+
+    auto const pBytes = static_cast<const coda_oss::byte*>(buffer_);
+    const coda_oss::span<const coda_oss::byte> buffer(pBytes, elemSize * numElems);
+
+    auto const pOutputBytes = static_cast<coda_oss::byte*>(outputBuffer_);
+    const coda_oss::span<coda_oss::byte> outputBuffer(pOutputBytes, elemSize * numElems);
+
+    std::ignore = ::byteSwap(buffer, elemSize, numElems, outputBuffer);
 }
 coda_oss::span<const coda_oss::byte> sys::byteSwap(coda_oss::span<const coda_oss::byte> buffer,
          size_t elemSize, coda_oss::span<coda_oss::byte> outputBuffer)
 {
-    if ((buffer.size() == 0) || (outputBuffer.size() == 0))
+    if ((buffer.empty()) || (outputBuffer.empty()))
     {
         return sys::make_const_span(outputBuffer);
     }
@@ -273,14 +310,16 @@ coda_oss::span<const coda_oss::byte> sys::byteSwap(coda_oss::span<const coda_oss
     }
     if (buffer.size() != outputBuffer.size())
     {
-        throw std::invalid_argument("'buffer' and 'outputBuffer' are different sizes'");
+        const auto s = "'buffer' and 'outputBuffer' are different sizes: " +
+                std::to_string(buffer.size()) + " != " + std::to_string(outputBuffer.size());
+        throw std::invalid_argument(s);
     }
-    
-    byteSwap(buffer.data(), elemSize, numElems, outputBuffer.data());
-    return sys::make_const_span(outputBuffer);
-}
 
- coda_oss::span<const coda_oss::byte> sys::byteSwap(
+    return ::byteSwap(buffer, elemSize, numElems, outputBuffer);
+ }
+
+// byte-swap a single value
+coda_oss::span<const coda_oss::byte> sys::byteSwap(
         coda_oss::span<const coda_oss::byte> inPtr,
         coda_oss::span<coda_oss::byte> outPtr)
 {
@@ -292,11 +331,11 @@ coda_oss::span<const coda_oss::byte> sys::byteSwap(coda_oss::span<const coda_oss
     const auto elemSize = inPtr.size();
     switch (elemSize)
     {
-        case sizeof(uint8_t): return details::swapUIntBytes<uint8_t>(inPtr, outPtr, std::nothrow);
-        case sizeof(uint16_t): return details::swapUIntBytes<uint16_t>(inPtr, outPtr, std::nothrow);
-        case sizeof(uint32_t): return details::swapUIntBytes<uint32_t>(inPtr, outPtr, std::nothrow);
-        case sizeof(uint64_t): return details::swapUIntBytes<uint64_t>(inPtr, outPtr, std::nothrow);
-        default: break;
+    case sizeof(uint8_t): return details::swapUIntBytes<uint8_t>(inPtr, outPtr, std::nothrow);
+    case sizeof(uint16_t): return details::swapUIntBytes<uint16_t>(inPtr, outPtr, std::nothrow);
+    case sizeof(uint32_t): return details::swapUIntBytes<uint32_t>(inPtr, outPtr, std::nothrow);
+    case sizeof(uint64_t): return details::swapUIntBytes<uint64_t>(inPtr, outPtr, std::nothrow);
+    default: break;
     }
 
     for (size_t ii = 0, jj = elemSize - 1; ii < jj; ++ii, --jj)
diff --git a/externals/coda-oss/modules/c++/sys/unittests/test_byte_swap.cpp b/externals/coda-oss/modules/c++/sys/unittests/test_byte_swap.cpp
index 954872bb0b..2d784428b8 100644
--- a/externals/coda-oss/modules/c++/sys/unittests/test_byte_swap.cpp
+++ b/externals/coda-oss/modules/c++/sys/unittests/test_byte_swap.cpp
@@ -27,6 +27,7 @@
 #include <std/bit> // std::endian
 #include <std/cstddef>
 #include <std/span>
+#include <type_traits>
 
 #include <sys/Conf.h>
 #include <sys/Span.h>
@@ -72,24 +73,25 @@ TEST_CASE(testEndianness)
     }
 }
 
-static std::vector<uint64_t> make_origValues(size_t NUM_PIXELS)
+template<typename T>
+static std::vector<T> make_origValues(size_t NUM_PIXELS)
 {
     ::srand(334);
 
-    std::vector<uint64_t> retval(NUM_PIXELS);
+    std::vector<T> retval(NUM_PIXELS);
     for (size_t ii = 0; ii < NUM_PIXELS; ++ii)
     {
         const auto value = static_cast<float>(::rand()) / RAND_MAX *
                 std::numeric_limits<uint64_t>::max();
-        retval[ii] = static_cast<uint64_t>(value);
+        retval[ii] = static_cast<T>(value);
     }
     return retval;
 }
 
-TEST_CASE(testByteSwap)
+TEST_CASE(testByteSwapV)
 {
     constexpr size_t NUM_PIXELS = 10000;
-    const auto origValues = make_origValues(NUM_PIXELS);
+    const auto origValues = make_origValues <uint64_t>(NUM_PIXELS);
 
     // Byte swap the old-fashioned way
     auto values1(origValues);
@@ -106,6 +108,74 @@ TEST_CASE(testByteSwap)
     }
 }
 
+TEST_CASE(testByteSwapCxV)
+{
+    constexpr size_t NUM_PIXELS = 10000;
+    using value_type = std::complex<float>;
+    const auto origValues = make_origValues<value_type>(NUM_PIXELS);
+
+    constexpr auto elemSize = sizeof(value_type) / 2;
+    constexpr auto numElems = NUM_PIXELS * 2;
+
+    // Byte swap the old-fashioned way
+    auto values1(origValues);
+    sys::byteSwap(values1.data(), elemSize, numElems);
+
+    // Byte swap into output buffer
+    std::vector<value_type> swappedValues2(origValues.size());
+    sys::byteSwap(origValues.data(), elemSize, numElems, swappedValues2.data());
+
+    // Everything should match
+    for (size_t ii = 0; ii < NUM_PIXELS; ++ii)
+    {
+        using int_type = uint64_t;
+        static_assert(sizeof(int_type) == sizeof(value_type), "Unknown sizeof(std::complex<float>)");
+
+        // If these values are byte-swapped, they could be bogus.
+        const void* const pValue1_ = &(values1[ii]);
+        const void* const pSwappedValue2_ = &(swappedValues2[ii]);
+        
+        auto const pValue1 = static_cast<const int_type*>(pValue1_);
+        auto const pSwappedValue2 = static_cast<const int_type*>(pSwappedValue2_);
+
+        TEST_ASSERT_EQ(*pValue1, *pSwappedValue2);
+    }
+}
+
+template<typename T>
+inline std::span<const T> as_span(const std::vector<std::byte>& bytes)
+{
+    const void* const pBytes_ = bytes.data();
+    auto const p = static_cast<const T*>(pBytes_);
+    const auto sz = bytes.size() / sizeof(T);
+    return sys::make_span(p, sz);
+}
+
+TEST_CASE(testByteSwap)
+{
+    constexpr size_t NUM_PIXELS = 10000;
+    const auto origValues = make_origValues<uint64_t>(NUM_PIXELS);
+    const auto origValues_ = sys::make_span(origValues);
+
+    auto values1(origValues);
+    sys::byteSwap(sys::make_span(values1));
+
+    // Byte swap into output buffer
+    std::vector<uint64_t> swappedValues2(origValues.size());
+    sys::byteSwap(origValues_, sys::as_writable_bytes(swappedValues2));
+
+    // std::vector<std::byte> returned
+    const auto swappedValues3_ = sys::byteSwap(origValues_);
+    const auto swappedValues3 = as_span<uint64_t>(swappedValues3_);
+
+    // Everything should match
+    for (size_t ii = 0; ii < NUM_PIXELS; ++ii)
+    {
+        TEST_ASSERT_EQ(values1[ii], swappedValues2[ii]);
+        TEST_ASSERT_EQ(values1[ii], swappedValues3[ii]);
+    }
+}
+
 // 0xnn is an `int` which can't be used to initialize std::byte w/o a cast
 #define CODA_OSS_define_byte(v) constexpr static std::byte v = static_cast<std::byte>(0 ## v)
 CODA_OSS_define_byte(x00);
@@ -131,6 +201,16 @@ static constexpr std::byte four_bytes[]{x00, x11, xEE, xFF};
 static constexpr std::byte eight_bytes[]{x00, x11, x22, x33, xCC, xDD, xEE, xFF};
 static constexpr std::byte sixteen_bytes[]{x00, x11, x22, x33, x44, x55, x66, x77, x88, x99, xAA, xBB, xCC, xDD, xEE, xFF};
 
+template<typename TByteSpanLike1, typename TByteSpanLike2>
+static void test_assert_eq_swapped(const std::string& testName, size_t sz,
+    const TByteSpanLike1& pValueBytes, const TByteSpanLike2& pResultBytes)
+{
+    for (size_t i = 0, j = sz; i < sz && j > 0; i++, j--)
+    {
+        TEST_ASSERT(pResultBytes[i] == pValueBytes[j - 1]);
+    }
+}
+
 template<typename TUInt>
 static void testByteSwapValues_(const std::string& testName, const void* pBytes)
 {
@@ -141,10 +221,7 @@ static void testByteSwapValues_(const std::string& testName, const void* pBytes)
     const void* pResult_ = &swap;
     auto const pResultBytes = static_cast<const std::byte*>(pResult_);
     auto const pValueBytes = static_cast<const std::byte*>(pBytes);
-    for (size_t i = 0, j = sizeof(TUInt); i < sizeof(TUInt) && j > 0; i++, j--)
-    {
-        TEST_ASSERT(pResultBytes[i] == pValueBytes[j-1]);
-    }
+    test_assert_eq_swapped(testName, sizeof(TUInt), pResultBytes, pValueBytes);
 
     swap = sys::byteSwap(swap);  // swap back
     TEST_ASSERT_EQ(*pUInt, swap);
@@ -155,12 +232,9 @@ static void testByteSwapValues_(const std::string& testName, const void* pBytes)
     sys::byteSwap(&swap, sizeof(TUInt), 1); // swap back
     TEST_ASSERT_EQ(*pUInt, swap);
 
-    const auto resultBytes = sys::swapBytes(*pUInt);
+    const auto resultBytes = sys::byteSwapValue(*pUInt);
     TEST_ASSERT_EQ(resultBytes.size(), sizeof(TUInt));
-    for (size_t i = 0, j = sizeof(TUInt); i < sizeof(TUInt) && j > 0; i++, j--)
-    {
-        TEST_ASSERT(resultBytes[i] == pValueBytes[j - 1]);
-    }
+    test_assert_eq_swapped(testName, sizeof(TUInt), resultBytes.data(), pValueBytes);
 }
 TEST_CASE(testByteSwapValues)
 {
@@ -169,65 +243,45 @@ TEST_CASE(testByteSwapValues)
     testByteSwapValues_<uint64_t>(testName, eight_bytes);
 }
 
+TEST_CASE(testByteSwapCxValue)
+{
+    using value_type = std::complex<float>;
+    const value_type cx{3.14f, -31.4f}; // using raw bytes can lean to `nan`s
+    auto const pValue = &cx;
+
+    auto swap = sys::byteSwap(*pValue);
+    TEST_ASSERT_NOT_EQ(*pValue, swap); // technically a bit goofy as the bits may not represent `T`s
+            
+    swap = sys::byteSwap(swap);  // swap back
+    TEST_ASSERT_EQ(*pValue, swap);
+}
+
 TEST_CASE(testByteSwap12)
 {
     // test a goofy element size
-    static constexpr std::byte twelve_bytes[]{
+    constexpr std::byte twelve_bytes[]{
         x00, x11, x22, x33, x44, x55,
         x99, xAA, xBB, xDD, xEE, xFF};
     const auto pValueBytes = sys::as_bytes(twelve_bytes);
+    constexpr auto extent_twelve_bytes = std::extent<decltype(twelve_bytes)>::value;
 
-    std::vector<std::byte> swappedValues(12);
+    std::vector<std::byte> swappedValues(extent_twelve_bytes);
     auto pResultBytes = sys::make_span(swappedValues);
 
     auto elemSize = 12;
     auto numElements = swappedValues.size() / elemSize;
     sys::byteSwap(twelve_bytes, elemSize, numElements, pResultBytes.data());
-    TEST_ASSERT(pResultBytes[0] == pValueBytes[11]);
-    TEST_ASSERT(pResultBytes[1] == pValueBytes[10]);
-    TEST_ASSERT(pResultBytes[2] == pValueBytes[9]);
-    TEST_ASSERT(pResultBytes[3] == pValueBytes[8]);
-    TEST_ASSERT(pResultBytes[4] == pValueBytes[7]);
-    TEST_ASSERT(pResultBytes[5] == pValueBytes[6]);
-    TEST_ASSERT(pResultBytes[6] == pValueBytes[5]);
-    TEST_ASSERT(pResultBytes[7] == pValueBytes[4]);
-    TEST_ASSERT(pResultBytes[8] == pValueBytes[3]);
-    TEST_ASSERT(pResultBytes[9] == pValueBytes[2]);
-    TEST_ASSERT(pResultBytes[10] == pValueBytes[1]);
-    TEST_ASSERT(pResultBytes[11] == pValueBytes[0]);
+    test_assert_eq_swapped(testName, elemSize, pResultBytes, pValueBytes);
 
     // swap as a SINGLE 12-byte value
-    const auto result = sys::details::swapBytes<12>(pValueBytes, pResultBytes);
-    TEST_ASSERT(result[0] == pValueBytes[11]);
-    TEST_ASSERT(result[1] == pValueBytes[10]);
-    TEST_ASSERT(result[2] == pValueBytes[9]);
-    TEST_ASSERT(result[3] == pValueBytes[8]);
-    TEST_ASSERT(result[4] == pValueBytes[7]);
-    TEST_ASSERT(result[5] == pValueBytes[6]);
-    TEST_ASSERT(result[6] == pValueBytes[5]);
-    TEST_ASSERT(result[7] == pValueBytes[4]);
-    TEST_ASSERT(result[8] == pValueBytes[3]);
-    TEST_ASSERT(result[9] == pValueBytes[2]);
-    TEST_ASSERT(result[10] == pValueBytes[1]);
-    TEST_ASSERT(result[11] == pValueBytes[0]);
-
+    const auto result = sys::details::swapBytes<extent_twelve_bytes>(pValueBytes, pResultBytes);
+    test_assert_eq_swapped(testName, elemSize, result, pValueBytes);
 
     elemSize = 6; // note that an ODD size doesn't work correctly
     numElements = swappedValues.size() / elemSize;
     sys::byteSwap(twelve_bytes, elemSize, numElements, swappedValues.data());
-    TEST_ASSERT(pResultBytes[0] == pValueBytes[5]);
-    TEST_ASSERT(pResultBytes[1] == pValueBytes[4]);
-    TEST_ASSERT(pResultBytes[2] == pValueBytes[3]);
-    TEST_ASSERT(pResultBytes[3] == pValueBytes[2]);
-    TEST_ASSERT(pResultBytes[4] == pValueBytes[1]);
-    TEST_ASSERT(pResultBytes[5] == pValueBytes[0]);
-
-    TEST_ASSERT(pResultBytes[6] == pValueBytes[11]);
-    TEST_ASSERT(pResultBytes[7] == pValueBytes[10]);
-    TEST_ASSERT(pResultBytes[8] == pValueBytes[9]);
-    TEST_ASSERT(pResultBytes[9] == pValueBytes[8]);
-    TEST_ASSERT(pResultBytes[10] == pValueBytes[7]);
-    TEST_ASSERT(pResultBytes[11] == pValueBytes[6]);
+    test_assert_eq_swapped(testName, elemSize, &(pResultBytes[0]), &(pValueBytes[0]));
+    test_assert_eq_swapped(testName, elemSize, &(pResultBytes[6]), &(pValueBytes[6]));
 
     sys::byteSwap(swappedValues.data(), elemSize, numElements); // swap back
     for (size_t i = 0; i < swappedValues.size(); i++)
@@ -240,7 +294,7 @@ template <typename T>
 static inline void six_byteSwap(const void* in, T& out)
 {
     auto const inBytes = sys::make_span<std::byte>(in, sizeof(T));
-    out = sys::swapBytes<T>(inBytes);
+    out = sys::byteSwapValue<T>(inBytes);
 }
 TEST_CASE(testSixByteSwap)
 {
@@ -256,8 +310,11 @@ TEST_CASE(testSixByteSwap)
 
 TEST_MAIN(
     TEST_CHECK(testEndianness);
+    TEST_CHECK(testByteSwapV);
+    TEST_CHECK(testByteSwapCxV);
     TEST_CHECK(testByteSwap);
     TEST_CHECK(testByteSwapValues);
+    TEST_CHECK(testByteSwapCxValue);
     TEST_CHECK(testByteSwap12);
     TEST_CHECK(testSixByteSwap);
     )
diff --git a/externals/coda-oss/modules/c++/tiff/include/tiff/GenericType.h b/externals/coda-oss/modules/c++/tiff/include/tiff/GenericType.h
index 9d5a994ea8..5e9787f00e 100644
--- a/externals/coda-oss/modules/c++/tiff/include/tiff/GenericType.h
+++ b/externals/coda-oss/modules/c++/tiff/include/tiff/GenericType.h
@@ -112,7 +112,8 @@ template <typename Data_T, typename Strategy_T = tiff::PrintStrategy> class Gene
      *****************************************************************/
     GenericType(const unsigned char *data)
     {
-        mData = *((Data_T *)data);
+        const void* const pData = data;
+        mData = *(static_cast<const Data_T*>(pData));
     }
 
     //! Deconstructor
diff --git a/externals/coda-oss/modules/c++/tiff/source/ImageWriter.cpp b/externals/coda-oss/modules/c++/tiff/source/ImageWriter.cpp
index ed89e6da93..284ffd52f0 100644
--- a/externals/coda-oss/modules/c++/tiff/source/ImageWriter.cpp
+++ b/externals/coda-oss/modules/c++/tiff/source/ImageWriter.cpp
@@ -230,20 +230,20 @@ void tiff::ImageWriter::validate()
 
 void tiff::ImageWriter::initTiles()
 {
-    sys::Uint32_T root = (sys::Uint32_T)sqrt((double)mIdealChunkSize
+    const sys::Uint32_T root = (sys::Uint32_T)sqrt((double)mIdealChunkSize
             / (double)mIFD.getElementSize());
-    sys::Uint32_T ceiling = (sys::Uint32_T)ceil(((double)root) / 16);
-    sys::Uint32_T tileSize = ceiling * 16;
+    const sys::Uint32_T ceiling = (sys::Uint32_T)ceil(((double)root) / 16);
+    const sys::Uint32_T tileSize = ceiling * 16;
 
     mIFD.addEntry("TileWidth", (sys::Uint32_T) tileSize);
     mIFD.addEntry("TileLength", (sys::Uint32_T) tileSize);
 
     auto fileOffset = mOutput->tell();
-    sys::Uint32_T tilesAcross = (mIFD.getImageWidth() + tileSize - 1)
+    const sys::Uint32_T tilesAcross = (mIFD.getImageWidth() + tileSize - 1)
             / tileSize;
-    sys::Uint32_T tilesDown = (mIFD.getImageLength() + tileSize - 1) / tileSize;
+    const sys::Uint32_T tilesDown = (mIFD.getImageLength() + tileSize - 1) / tileSize;
 
-    unsigned short elementSize = mIFD.getElementSize();
+    const unsigned short elementSize = mIFD.getElementSize();
 
     mIFD.addEntry("TileByteCounts");
     mIFD.addEntry("TileOffsets");
@@ -251,7 +251,7 @@ void tiff::ImageWriter::initTiles()
     {
         for (sys::Uint32_T x = 0; x < tilesAcross; ++x)
         {
-            sys::Uint32_T byteCount = tileSize * tileSize * elementSize;
+            const sys::Uint32_T byteCount = tileSize * tileSize * elementSize;
             mIFD.addEntryValue("TileOffsets", (sys::Uint32_T) fileOffset);
             mIFD.addEntryValue("TileByteCounts", (sys::Uint32_T) byteCount);
             fileOffset += byteCount;
diff --git a/externals/coda-oss/modules/c++/tiff/source/Utils.cpp b/externals/coda-oss/modules/c++/tiff/source/Utils.cpp
index 9467a08d48..59de597e3b 100644
--- a/externals/coda-oss/modules/c++/tiff/source/Utils.cpp
+++ b/externals/coda-oss/modules/c++/tiff/source/Utils.cpp
@@ -83,10 +83,10 @@ tiff::IFD* tiff::Utils::createGeoTiffIFD(tiff::IFD* ifd)
     tiff::IFD* geoIFD = new tiff::IFD;
 
     tiff::IFDEntry *geoDir = (*ifd)["GeoKeyDirectoryTag"];
-    tiff::IFDEntry *doubleParams =
+    tiff::IFDEntry* const doubleParams =
             ifd->exists("GeoDoubleParamsTag") ? (*ifd)["GeoDoubleParamsTag"]
                                               : NULL;
-    tiff::IFDEntry *asciiParams =
+    tiff::IFDEntry* const asciiParams =
             ifd->exists("GeoAsciiParamsTag") ? (*ifd)["GeoAsciiParamsTag"]
                                              : NULL;
 
diff --git a/externals/coda-oss/modules/c++/xml.lite/include/xml/lite/ValidatorXerces.h b/externals/coda-oss/modules/c++/xml.lite/include/xml/lite/ValidatorXerces.h
index 224b54fd01..3cdde68844 100644
--- a/externals/coda-oss/modules/c++/xml.lite/include/xml/lite/ValidatorXerces.h
+++ b/externals/coda-oss/modules/c++/xml.lite/include/xml/lite/ValidatorXerces.h
@@ -114,10 +114,9 @@ class ValidatorXerces : public ValidatorInterface
     ValidatorXerces(const std::vector<std::string>& schemaPaths, 
                     logging::Logger* log,
                     bool recursive = true);
-    ValidatorXerces(const std::vector<coda_oss::filesystem::path>&,
+    ValidatorXerces(const std::vector<coda_oss::filesystem::path>&, // fs::path -> mLegacyStringConversion = false
                     logging::Logger* log,
                     bool recursive = true);
-    ValidatorXerces(const coda_oss::filesystem::path&, logging::Logger&);
 
     ValidatorXerces(const ValidatorXerces&) = delete;
     ValidatorXerces& operator=(const ValidatorXerces&) = delete;
@@ -142,15 +141,11 @@ class ValidatorXerces : public ValidatorInterface
     static std::vector<coda_oss::filesystem::path> loadSchemas(const std::vector<coda_oss::filesystem::path>& schemaPaths, bool recursive=true);
 
 private:
-    void initialize(); // easier than chaining constructors w/existing code
-
     bool validate_(const coda_oss::u8string& xml, 
                    const std::string& xmlID,
                    std::vector<ValidationInfo>& errors) const;
 
-    void loadGrammar(const coda_oss::filesystem::path&, logging::Logger&);
     std::unique_ptr<xercesc::XMLGrammarPool> mSchemaPool;
-
     std::unique_ptr<xml::lite::ValidationErrorHandler> mErrorHandler;
     std::unique_ptr<xercesc::DOMLSParser> mValidator;
 
diff --git a/externals/coda-oss/modules/c++/xml.lite/source/Element.cpp b/externals/coda-oss/modules/c++/xml.lite/source/Element.cpp
index 1513003f71..ddb7177d81 100644
--- a/externals/coda-oss/modules/c++/xml.lite/source/Element.cpp
+++ b/externals/coda-oss/modules/c++/xml.lite/source/Element.cpp
@@ -111,6 +111,7 @@ void xml::lite::Element::getElementsByTagName(const QName& n, std::vector<Elemen
     const auto uri = n.getUri().value;
     const auto localName = n.getName();
 
+    elements.reserve(mChildren.size());
     for (unsigned int i = 0; i < mChildren.size(); i++)
     {
         if (mChildren[i]->getUri() == uri && mChildren[i]->getLocalName()
@@ -163,6 +164,7 @@ void xml::lite::Element::getElementsByTagName(const std::string& localName,
                                               std::vector<Element*>& elements,
                                               bool recurse) const 
 {
+    elements.reserve(mChildren.size());
     for (unsigned int i = 0; i < mChildren.size(); i++)
     {
         if (mChildren[i]->getLocalName() == localName)
@@ -192,6 +194,7 @@ void xml::lite::Element::getElementsByTagNameNS(const std::string& qname,
                                                 std::vector<Element*>& elements,
                                                 bool recurse) const
 {
+    elements.reserve(mChildren.size());
     for (unsigned int i = 0; i < mChildren.size(); i++)
     {
         if (mChildren[i]->mName.toString() == qname)
diff --git a/externals/coda-oss/modules/c++/xml.lite/source/NamespaceStack.cpp b/externals/coda-oss/modules/c++/xml.lite/source/NamespaceStack.cpp
index 4ab0471120..998b41ba53 100644
--- a/externals/coda-oss/modules/c++/xml.lite/source/NamespaceStack.cpp
+++ b/externals/coda-oss/modules/c++/xml.lite/source/NamespaceStack.cpp
@@ -64,6 +64,7 @@ void xml::lite::NamespaceStack::getMapping(const std::string& prefix, Uri& resul
 void xml::lite::NamespaceStack::
 getAllPrefixes(std::vector<std::string>& allPrefixes) const
 {
+    allPrefixes.reserve(mMappingStack.size());
     for (unsigned int i = 0; i < mMappingStack.size(); i++)
     {
         allPrefixes.push_back(mMappingStack[i].first);
diff --git a/externals/coda-oss/modules/c++/xml.lite/source/ValidatorXerces.cpp b/externals/coda-oss/modules/c++/xml.lite/source/ValidatorXerces.cpp
index fe75d84e12..7e794d4e4b 100644
--- a/externals/coda-oss/modules/c++/xml.lite/source/ValidatorXerces.cpp
+++ b/externals/coda-oss/modules/c++/xml.lite/source/ValidatorXerces.cpp
@@ -111,36 +111,7 @@ ValidatorXerces::ValidatorXerces(
     bool recursive) :
     ValidatorInterface(schemaPaths, log, recursive)
 {
-    initialize();
-
-    // load our schemas --
-    // search each directory for schemas
-    const auto schemas = loadSchemas(convert(schemaPaths), recursive);
-
-    //  add the schema to the validator
-    for (auto&& schema : schemas)
-    {
-        loadGrammar(schema, *log);
-    }
-
-    //! no additional schemas will be loaded after this point!
-    mSchemaPool->lockPool();
-}
-ValidatorXerces::ValidatorXerces(const coda_oss::filesystem::path& schema, logging::Logger& log) :
-    ValidatorXerces(std::vector<fs::path>{schema}, &log, false /*recursive*/)
-{
-    initialize();
-
-    //  add the schema to the validator
-    loadGrammar(schema, log);
-
-    //! no additional schemas will be loaded after this point!
-    mSchemaPool->lockPool();
-}
-
-void ValidatorXerces::initialize()
- {
-     // add each schema into a grammar pool --
+    // add each schema into a grammar pool --
     // this allows reuse
     mSchemaPool.reset(
         new xercesc::XMLGrammarPoolImpl(
@@ -189,20 +160,28 @@ void ValidatorXerces::initialize()
             new ValidationErrorHandler());
     config->setParameter(xercesc::XMLUni::fgDOMErrorHandler, 
                          mErrorHandler.get());
-}
 
- void ValidatorXerces::loadGrammar(const coda_oss::filesystem::path& schema, logging::Logger& log)
-{
-     //  add the schema to the validator
-     if (!mValidator->loadGrammar(schema.c_str(),
-                                  xercesc::Grammar::SchemaGrammarType,
-                                  true))
-     {
-         std::ostringstream oss;
-         oss << "Error: Failure to load schema " << schema;
-         log.warn(Ctxt(oss.str()));
-     }
- }
+    // load our schemas --
+    // search each directory for schemas
+    const auto schemas = loadSchemas(convert(schemaPaths), recursive);
+
+    //  add the schema to the validator
+    //  add the schema to the validator
+    for (auto&& schema : schemas)
+    {
+        if (!mValidator->loadGrammar(schema.c_str(),
+                                     xercesc::Grammar::SchemaGrammarType,
+                                     true))
+        {
+            std::ostringstream oss;
+            oss << "Error: Failure to load schema " << schema;
+            log->warn(Ctxt(oss.str()));
+        }
+    }
+
+    //! no additional schemas will be loaded after this point!
+    mSchemaPool->lockPool();
+}
 
 std::vector<coda_oss::filesystem::path> ValidatorXerces::loadSchemas(const std::vector<coda_oss::filesystem::path>& schemaPaths, bool recursive)
 {
diff --git a/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlparser.cpp b/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlparser.cpp
index b6d443bd55..6a4ff8bf18 100644
--- a/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlparser.cpp
+++ b/externals/coda-oss/modules/c++/xml.lite/unittests/test_xmlparser.cpp
@@ -417,11 +417,14 @@ TEST_CASE(testReadEmbeddedXml)
 }
 
 template <typename TStringStream>
-static void testValidateXmlFile_(const std::string& testName,
-    const xml::lite::Validator& validator, const std::string& xmlFile, TStringStream* pStringStream)
+static void testValidateXmlFile_(const std::string& testName, const std::string& xmlFile, TStringStream* pStringStream)
 {
+    static const auto xsd = find_unittest_file("doc.xsd");
     const auto path = find_unittest_file(xmlFile);
 
+    const std::vector<std::filesystem::path> schemaPaths{xsd.parent_path()}; // fs::path -> new string-conversion code
+    const xml::lite::Validator validator(schemaPaths, nullptr /*log*/);
+
     io::FileInputStream fis(path);
     std::vector<xml::lite::ValidationInfo> errors;
     const auto result = (pStringStream == nullptr) ? validator.validate(fis, path.string() /*xmlID*/, errors) :
@@ -432,18 +435,7 @@ static void testValidateXmlFile_(const std::string& testName,
     }
     TEST_ASSERT_FALSE(result);
     TEST_ASSERT_TRUE(errors.empty());
-
-}
-template <typename TStringStream>
-static void testValidateXmlFile_(const std::string& testName, const std::string& xmlFile, TStringStream* pStringStream)
-{
-    static const auto xsd = find_unittest_file("doc.xsd");
-    const std::vector<std::filesystem::path> schemaPaths{xsd.parent_path()}; // fs::path -> new string-conversion code
-    const xml::lite::Validator validator(schemaPaths, nullptr /*log*/);
-
-    testValidateXmlFile_(testName, validator, xmlFile, pStringStream);
 }
-
 static void testValidateXmlFile(const std::string& testName, const std::string& xmlFile)
 {
     testValidateXmlFile_<io::StringStream>(testName, xmlFile, nullptr /*pStringStream*/);
@@ -471,42 +463,6 @@ TEST_CASE(testValidateXmlFile)
     testValidateXmlFile(testName, "encoding_windows-1252.xml", io::W1252StringStream());
 }
 
-template <typename TStringStream>
-static void testValidateXmlFile_XSD_(const std::string& testName, const std::string& xmlFile, TStringStream* pStringStream)
-{
-    static const auto xsd = find_unittest_file("doc.xsd");
-    logging::Logger log;
-    const xml::lite::Validator validator(xsd, log);
-    testValidateXmlFile_(testName, validator, xmlFile, pStringStream);
-}
-static void testValidateXmlFile_XSD(const std::string& testName, const std::string& xmlFile)
-{
-    testValidateXmlFile_XSD_<io::StringStream>(testName, xmlFile, nullptr /*pStringStream*/);
-}
-template <typename TStringStream>
-static void testValidateXmlFile_XSD(const std::string& testName, const std::string& xmlFile, TStringStream&& oss)
-{
-    testValidateXmlFile_XSD_(testName, xmlFile, &oss);
-}
-TEST_CASE(testValidateXmlFile_XSD)
-{
-    // Validate using a single XSD
-    testValidateXmlFile_XSD(testName, "ascii.xml");
-    testValidateXmlFile_XSD(testName, "ascii_encoding_utf-8.xml");
-
-    // legacy validate() API, new string conversion
-    testValidateXmlFile_XSD(testName, "utf-8.xml");
-    testValidateXmlFile_XSD(testName, "encoding_utf-8.xml");
-    testValidateXmlFile_XSD(testName, "encoding_windows-1252.xml");
-    testValidateXmlFile_XSD(testName, "windows-1252.xml");
-
-    // new validate() API
-    testValidateXmlFile_XSD(testName, "utf-8.xml", io::U8StringStream());
-    testValidateXmlFile_XSD(testName, "encoding_utf-8.xml", io::U8StringStream());
-    testValidateXmlFile_XSD(testName, "windows-1252.xml", io::W1252StringStream());
-    testValidateXmlFile_XSD(testName, "encoding_windows-1252.xml", io::W1252StringStream());
-}
-
 int main(int, char**)
 {
     TEST_CHECK(testXmlParseSimple);
@@ -525,5 +481,4 @@ int main(int, char**)
     TEST_CHECK(testReadEmbeddedXml);
 
     TEST_CHECK(testValidateXmlFile);
-    TEST_CHECK(testValidateXmlFile_XSD);    
 }
diff --git a/externals/nitro/ReleaseNotes.md b/externals/nitro/ReleaseNotes.md
index 3446ae82f6..c158869648 100644
--- a/externals/nitro/ReleaseNotes.md
+++ b/externals/nitro/ReleaseNotes.md
@@ -1,5 +1,11 @@
 # NITRO (NITF i/o) Release Notes
 
+## [Version 2.11.3](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.3); June 5, 2023
+* [coda-oss](https://github.com/mdaus/coda-oss) release [2023-06-05](https://github.com/mdaus/coda-oss/releases/tag/2023-06-05)
+* Fix display of [certain TREs](https://github.com/mdaus/nitro/issues/529).
+* Adjust compiler flags for clean *CMake* builds.
+* Implement `DecompressionInterface::adapterFreeBlock()` to fix decompression.
+
 ## [Version 2.11.2](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.2); December 14, 2022
 * [coda-oss](https://github.com/mdaus/coda-oss) release [2022-12-14](https://github.com/mdaus/coda-oss/releases/tag/2022-12-14)
 * Further work at getting unittests to work better when included elsewhere (e.g., SIX) as **externals**.
@@ -20,7 +26,7 @@ except that C++14 is now required.  [master](https://github.com/mdaus/nitro/tree
 * [coda-oss](https://github.com/mdaus/coda-oss) release [2022-08-30](https://github.com/mdaus/coda-oss/releases/tag/2022-08-30)
 * Build JPEG decompression as a plug-in.
 * tweak unittests so they run in SIX.
-* Final C++11 release 🤞🏻; future releases will be C++14 from [main](https://github.com/mdaus/nitro/tree/main).
+* ~~Final C++11 release 🤞🏻; future releases will be C++14 from [main](https://github.com/mdaus/nitro/tree/main).~~
 
 ## [Version 2.10.11](https://github.com/mdaus/nitro/releases/tag/NITRO-2.10.11); August 2, 2022
 * [coda-oss](https://github.com/mdaus/coda-oss) release [2022-08-02](https://github.com/mdaus/coda-oss/releases/tag/2022-08-02)
diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp b/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp
index 25b401c9a7..094ad93d75 100644
--- a/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp
+++ b/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp
@@ -36,9 +36,10 @@
  // 2.11.0	August 30, 2022 (C++14)
  // 2.11.1	November 4, 2022
  // 2.11.2	December 14, 2022
+ // 2.11.3	June 5, 2023
 #define NITF_VERSION_MAJOR	2
 #define NITF_VERSION_MINOR	11
-#define NITF_VERSION_PATCH	2
+#define NITF_VERSION_PATCH	3
 #define NITF_VERSION_BUILD		0
 #define NITF_VERSION CODA_OSS_MAKE_VERSION_MMPB(NITF_VERSION_MAJOR, NITF_VERSION_MINOR, NITF_VERSION_PATCH, NITF_VERSION_BUILD)
 
diff --git a/externals/nitro/modules/c/nrt/include/nrt/Version.h b/externals/nitro/modules/c/nrt/include/nrt/Version.h
index feea215eb5..ffce796775 100644
--- a/externals/nitro/modules/c/nrt/include/nrt/Version.h
+++ b/externals/nitro/modules/c/nrt/include/nrt/Version.h
@@ -1,5 +1,5 @@
 #pragma once
 
 #if !defined(NRT_LIB_VERSION)
-#define NRT_LIB_VERSION "2.11.2"
+#define NRT_LIB_VERSION "2.11.3"
 #endif
diff --git a/six/modules/c++/cphd/source/ByteSwap.cpp b/six/modules/c++/cphd/source/ByteSwap.cpp
index 241d3dd987..4f69666ed6 100644
--- a/six/modules/c++/cphd/source/ByteSwap.cpp
+++ b/six/modules/c++/cphd/source/ByteSwap.cpp
@@ -46,7 +46,7 @@ template <typename T>
 inline void byteSwap(const void* in, T& out)
 {
     auto const inBytes = sys::make_span<std::byte>(in, sizeof(T));
-    out = sys::swapBytes<T>(inBytes);
+    out = sys::byteSwapValue<T>(inBytes);
 }
 
 inline const std::byte* calc_offset(const void* input_, size_t offset)
diff --git a/six/modules/c++/six/include/six/Data.h b/six/modules/c++/six/include/six/Data.h
index 1c004fbeac..d22e212db1 100644
--- a/six/modules/c++/six/include/six/Data.h
+++ b/six/modules/c++/six/include/six/Data.h
@@ -84,7 +84,21 @@ struct Data
     template<typename T, typename U>
     bool convertPixels(std::span<const T> from, std::span<U> to, ptrdiff_t cutoff = -1) const
     {
-        return convertPixels_(std::as_bytes(from), std::as_writable_bytes(to), cutoff);
+        // coda-oss checks to be sure T and U are trivially_copyable.  While this is
+        // correct (converting something else to bytes doesn't make sense), existing
+        // code didn't have that check.
+        //
+        // TODO: use std::as_bytes() directly
+
+        const void* const pFrom = from.data();
+	auto const pFromBytes = static_cast<const std::byte*>(pFrom);
+	const std::span<const std::byte> fromBytes(pFromBytes, from.size_bytes());
+
+	void* const pTo = to.data();
+	auto const pToBytes = static_cast<std::byte*>(pTo);
+	const std::span<std::byte> toBytes(pToBytes, to.size_bytes());
+
+        return convertPixels_(fromBytes, toBytes, cutoff);
     }
 
     /*!
diff --git a/six/modules/c++/six/include/six/Utilities.h b/six/modules/c++/six/include/six/Utilities.h
index 36658b443f..ce7ab873a1 100644
--- a/six/modules/c++/six/include/six/Utilities.h
+++ b/six/modules/c++/six/include/six/Utilities.h
@@ -320,23 +320,35 @@ std::string findSchemaPath(const std::string& progname);
 template<typename T>
 inline std::span<const std::byte> as_bytes(std::span<const T> buffer)
 {
-    return std::as_bytes(buffer);
+    // coda-oss checks to be sure T is trivially_copyable.  While this is
+    // correct (converting something else to bytes doesn't make sense), existing
+    // code didn't have that check.
+    const void* const pData = buffer.data();
+    auto const pBytes = static_cast<const std::byte*>(pData);
+    return std::span<const std::byte>(pBytes, buffer.size_bytes()); // TODO: use std::as_bytes
 }
 template<typename T>
 inline std::span<const std::byte> as_bytes(const std::vector<T>& buffer)
 {
-    return sys::as_bytes(buffer);
+    const auto s = sys::make_span(buffer);
+    return six::as_bytes(s);
 }
 
 template<typename T>
-inline std::span<std::byte> as_writable_bytes(std::vector<T>& buffer)
+inline std::span<std::byte> as_writable_bytes(std::span<T>& buffer)
 {
-    return sys::as_writable_bytes(buffer);
+    // coda-oss checks to be sure T is trivially_copyable.  While this is
+    // correct (converting something else to bytes doesn't make sense), existing
+    // code didn't have that check.
+    void* const pData = buffer.data();
+    auto const pBytes = static_cast<std::byte*>(pData);
+    return std::span<std::byte>(pBytes, buffer.size_bytes()); // TODO: use std::as_writable_bytes
 }
 template<typename T>
-inline std::span<std::byte> as_writable_bytes(std::span<T>& buffer)
+inline std::span<std::byte> as_writable_bytes(std::vector<T>& buffer)
 {
-    return std::as_writable_bytes(buffer);
+    const auto s = sys::make_span(buffer);
+    return as_writable_bytes(s);
 }
 
 namespace testing