Skip to content

Commit

Permalink
turn off /Wall for MSVC (#718)
Browse files Browse the repository at this point in the history 
* some projects get <six/Utilities.h> indirectrly

* trying to build with VS2022 17.2

* scene doesn't use XML

* move #pragma warning(disable) to import/xml/lite.h

* slam-in "main"

* fix compiler diagnostic about "possibly uninitialized result"

* update "externals" to remove compiler warnings

* cmake -j 8 seems to work

* remove more compiler warnings

* setAttribute*() overloads

* getISMUri() utility routine

* double -> float warnings

* latest from coda-oss and NITRO

* Squashed 'externals/coda-oss/' changes from 1582c6ac9..0657f3297

0657f3297 adjust compiler flags for clean CMake builds (#650)
81285872f build cleanly with all G++ warnings enabled (#649)
b9ea37bbf xml::lite::Validator can be moved (#648)
9cfe9a4a8 Merge branch 'master'
e989b0910 createElement() needs to be virtual (#646)
4bdaf10d9 Change xml lite function to virtual (#645)
d17b57a54 Merge branch 'master'
fa00a5430 move debug -g flags to be turned on only if debugging (#644)
6be8f0a2e move debug -g flags to be turned on only if debugging (#644)
44ab72854 routines for simple writing to HDF5 files (#643)
aabc5818e remove more C++11 work-arounds (#642)
b04ccca17 remove more C++11 work-arounds (#641)
e460970a7 increase GCC warnings (#640)
91284249b provide ComplexView iterator support (#639)
453b7ec68 try to get std::make_unique working with old Intel compiler (#638)
5736cfd4d is_trivially_copyable for old Intel compiler (#637)
7c2aea38f use H5 SDK naming conventions (#636)
fc3008b8d use 'modern' C pre-processor
b44709a95 added ComplexSpansView utility (#635)
986307c9c Merge branch 'master'
e1b0fa349 commit (but not build) HDF5 source code (#634)
3fd5ddae5 Merge branch 'main' into develop/remove-cpp11-workarounds
37d7ec76e restore C++14 workarounds for older compilers (#632)
244dfdb3d Merge branch 'develop/main' into develop/remove-cpp11-workarounds
714ca4ed7 restore C++14 workarounds for older compilers
640f2247c Delete hdf5-hdf5-1_13_2.tar.gz
eb365cbfb Merge branch 'master' into develop/remove-cpp11-workarounds
57b938eeb don't need __INTEL_COMPILER work-around with C++14
65779f3b1 build C code with -std=gnu99
94dc9280f C++14 work-arounds for an old version of the Intel compiler
3744d05e2 slam-in "main"
82b2fd63b restore some C++14 work-arounds for old compilers that only have partial C++14 support
94f6950a2 Merge branch 'main' into develop/remove-cpp11-workarounds
1ac97fe48 add HDF5 source code (not built) (#612)
8ab982820 Squashed commit of the following:
31781a14a remove C++17 work-arounds
c15f6930c Revert "<filesystem> is in C++17"
0fe38c16f restore recent buld.py changes
0c75411ee <filesystem> is in C++17
bbbcd562a remove C++11 work-arounds
c1e15e9d9 Merge branch 'main' into main-cpp17
bea818fb0 must use C++17 in this branch
91653a096 another place where C++17 is set
7d555f2be back to C++17
b1969d996 merge main
0792c77bf Merge branch 'main' into develop/remove-cpp11-workarounds
e49f273c1 Merge branch 'main' into develop/remove-cpp11-workarounds
240b61044 allow sys::Mutex references, instead of pointers, to be passed to sys::ConditionVar
9500d6f4b Merge branch 'main' into develop/remove-cpp11-workarounds
f1529942f std::make_unique instead of new
be9b6a71c Squashed commit of the following:
62a2ec4e1 Revert "remove our GSL work-around for C++11"
1db082c21 Revert "try the current "main" of GSL"
44b70edde try the current "main" of GSL
4edbf6bad Revert ""There is no warning 4814""
bcd7458be "There is no warning 4814"
c185bf3f1 starting working on MutexCpp11
313bdd1d9 AtomicCounter* files have been removed
c1c448051 remove our GSL work-around for C++11
37ae1193e remove our mem::SharedPtr, it's now always std::shared_ptr
71f3c1299 remove no-longer-used NSPR code
8e77cb210 removed no-longer-used Irix and Solaris files
fabef6966 use std::atomic for all AtomicCounter implementations
ace5b6d5a TEST_FAIL -> TEST_FAIL_MSG
30076c1d1 turns out there was already a TEST_FAIL macro
d73ee16fb need "::" to find global test
ba01c48df remove C++11 workarounds for C++14 features
cbd4a31ae Squashed commit of the following:
b21c203b8 Squashed commit of the following:
5b542c60f Squashed commit of the following:
cb0cf94ff ByteStream.cpp is now warning-free
f5daa37fc cast to DWORD; "const" correctness
bfaf644ff #pragma-away compiler warnings from standard headers
72d202dbe Merge branch 'master' into develop/reduce-compiler-warnings
b076580cd trying to fix GCC compiler warning
1687dc7fc Merge branch 'master' into develop/reduce-compiler-warnings
2c5db86db Merge branch 'master' into develop/reduce-compiler-warnings
6f76c2e3e Update CMakeLists.txt
c3ca4a538 do in-line initialization
8e6733618 remove G++ compiler warning
a0eff51cf Merge branch 'master' into develop/reduce-compiler-warnings
af19d88a6 Merge branch 'master' into develop/reduce-compiler-warnings
ba31cbaa9 use "void*" to avoid reinterpret_cast<>
08da1f8a1 Merge branch 'master' into develop/reduce-compiler-warnings
d1d453a2e Merge branch 'master' into develop/reduce-compiler-warnings
f5074a996 CODA_OSS_NDEBUG is extra gunk and not used; omit for now.
22de48858 don't even bother compiling our own versions of localtime_s() and gmtime_s() if we're not going to use them (compiler warning about "unused static funtion.")
0c92eba58 tweak NDEBUG/CODA_OSS_NDEBUG; update comments
544604775 Don't need to expose our own versions of localtime_s() and gmtime_s()
a050796c1 Merge branch 'develop/reduce-compiler-warnings' of github.com:mdaus/coda-oss into develop/reduce-compiler-warnings
fed604617 older compilers want std::string() as argument to std::logic_error()
cf2c502a6 do more debug & release builds on GitHub
d4aa99256 build some debug targets on Gitlab
368245258 tweak CODA_OSS_DEBUG again for G++
24ba64f71 tweak how CODA_OSS_DEBUG is set
9680e8f0e add check for _GLIBCXX_DEBUG
943218f83 Merge branch 'master' into develop/reduce-compiler-warnings
01c68e705 %#@*@%)*%@ fix RowCol::cast() again! :-(
b8472b457 oops ... gsl::narrow<> should be gsl::narrow_cast<> so that int/double conversion doesn't throw
109255ca8 "final" breaks SWIG; wrap RowCol use of gsl::narrow
e51e4c2ad no need to create local just to return
e546f2510 Merge branch 'master' into develop/reduce-compiler-warnings
d1391f989 use template for to_std_string() overloading
566942680 fix std::char8_t when building with C++20
cf604b1ab fix C++17 build errors
48a0fbedb get rid of coda_oss namespace; use CODA_OSS_cpp17 instead
9706a4336 remove code-analysis diagnostics
50592e4f8 G++ complains about an unneeded call to std::move()
9c7643c3f Merge branch 'master' into develop/reduce-compiler-warnings
ecfe1f8a7 more "noexcept"
b7ac50fb9 Merge branch 'master' into develop/reduce-compiler-warnings
eaecf46ed tweak CODA_OSS_cplusplus from "main"
5773b1ec1 trying to get C++17 WAF build working on Windows
a048a00a1 unique names for waf & CMake
7a5a0d5b2 do a better job of setting CODA_OSS_DEBUG
4355aae92 Merge branch 'master' into develop/reduce-compiler-warnings
1fd8cede2 cleanup for VS 2019 16.10
4dffa1394 explicitly =delete copy/assignment
df8f8920a Merge branch 'master' into develop/reduce-compiler-warnings
42b4e99b6 remove code-analysis diagnostics
70ce322c9 reduce compiler warnings/code-analysis diagnostics when building six
20eac2f49 Merge branch 'master' into develop/reduce-compiler-warnings
ff3ded56d get rid of more compiler warnings/code-analysis diagnostics
669dd51ff Merge branch 'master' into develop/reduce-compiler-warnings
623b65ab9 Merge branch 'master' into develop/reduce-compiler-warnings
11c75df53 fix release build errors
66f048b92 turn on more compiler warnings where possible
eb615e315 consolidate calls to mem::make::unique
a6f5eb690 reduce use of explicit new
84d5e1b01 use mem::make::unique instead of explicit new
019d726ea = default for default constructors
86ab5d8f3 use std::unique_ptr and "const noexcept"
b071972d7 another batch of =default for default constructors
98276da94 more =default for default .ctor()s
ceb7bc596 do default constructors with =default
7bed51750 more code-analysis cleanup
f9c04b117 "noexcept" code-analysis warnings
6586ae390 need gsl::make_span from gsl/span_ext
722089774 remove gsl/mem dependency cycle
d741a0761 use gsl::narrow<> instead of static_cast
99eb4b36e get rid of signed/unsigned mismatch compiler warning
814450522 remove more code-analysis diagnostics
c8441b309 Merge branch 'master' into develop/reduce-compiler-warnings
e6d70a9ff last of "const" from code-analysis
b8445814a mark a few more things as "const" per code-analysis
d18544ec7 don't need to create temporary std::strings
ee7faa979 still more code-analysis cleanup
5cd6f864d cleanup more code-analysis diagnostics
492fb0a86 one more compiler warning about implicitly deleted copy/assignment
b8f782c88 remove compiler warnings about implicitly deleted copy/assignment/move
14d1d1cb8 #pragma-away warnings from GSL
86c40ea6c assert() to prevent some code-analysis diagnostics
7204517a9 make copy/assignment explicit
3ce824079 reduce code-analysis diagnostics
01e367a56 Merge branch 'master' into develop/reduce-compiler-warnings
03f3ddde9 proper printf format
877d7dc93 Merge branch 'master' into develop/reduce-compiler-warnings
5a4a3d575 code-analysis doesn't like C-style casts
a3fdae416 code-analysis doesn't like NULL
6309baedc Merge branch 'master' into develop/reduce-compiler-warnings
d1194a2fe Merge branch 'master' into develop/reduce-compiler-warnings
535b4757d Merge branch 'develop/reduce-compiler-warnings' of github.com:mdaus/coda-oss into develop/reduce-compiler-warnings
a60b95d60 "constexpr" can be hard to get right with older C++11 compilers; don't even try
c07b5303e Merge branch 'master' into develop/reduce-compiler-warnings
04306bbee need at least VS2017 to use the real GSL
796ad820b Merge branch 'master' into develop/reduce-compiler-warnings
16c240cd6 Merge branch 'master' into develop/reduce-compiler-warnings
e07e89f0c turn on "warnings as errors" for CMAKE builds
5c019f891 complex "constexpr" functions not available with our version of g++
4ab074a58 fix a few more compiler warnings ... nearing the end! :-)
dea7ea41b And still more compiler warnings ... almost done 🤞🏻
fbe3bbb20 remove assorted compiler warnings
e60b7fd3c Merge branch 'master' into develop/reduce-compiler-warnings
e9df212c6 Arguments should be "const&" to prevent C4866
94e75cbed Merge branch 'master' into develop/reduce-compiler-warnings
d3130414a Merge branch 'master' into develop/reduce-compiler-warnings
9a5e71f31 Merge branch 'master' into develop/reduce-compiler-warnings
bd27c0232 Merge branch 'master' into develop/reduce-compiler-warnings
c053362d2 remove still more compiler warnings
9f133b85a remove some more compiler warnings
0883c729c Merge branch 'master' into develop/reduce-compiler-warnings
f4b766880 avoid comparision between signed/unsigned to prevent compiler warning
1e6564a6e eliminate more compiler warnings
85a7b8ad0 remove a few compiler warnings
09c82049f Merge branch 'master' into develop/reduce-compiler-warnings
31f1662fa Merge branch 'master' into develop/reduce-compiler-warnings
a313562a3 Merge branch 'feature/fix-compiler-warnings' into develop/reduce-compiler-warnings
8547cdd24 eliminiate GCC warnings from Filesystem.h
b5044b2a2 fix several compiler warnings/code-analysis diagnostics
9d2f90b8c GetEnvironmentVariable() and getenv() aren't quite the same
6faa3666f remove more compiler warnings

git-subtree-dir: externals/coda-oss
git-subtree-split: 0657f3297a806dba9312355b3231bac38f50b5d4

* Squashed 'externals/nitro/' changes from e1a64da1f..e2f038e45

e2f038e45 adjust compiler flags for clean CMake builds (#533)
b871d2b9c latest from coda-oss (#532)
e8ff6b444 apps: fix display of TREs from file extended header section (#529)
463c9e418 latest from coda-oss (#531)
24ff32863 -j 6 seems to work for SIX, how about NITRO?
713ee8538 -j 6 seems to work for SIX, how about NITRO?
4ccdf5b37 latest from coda-oss (#527)
c71acc492 latest from coda-oss (#526)
08cbb96f9 build with older C++14 compilers (#524)

git-subtree-dir: externals/nitro
git-subtree-split: e2f038e4572376c73fd63e5b35a6b58f6a75fba7

* latest from coda-oss and NITRO

* build SIX cleanly with CMake using GCC

* build SIX cleanly with CMake using GCC

* get closer to a clean build with MSVC

* clean CMake build with MSVC

* fix Release build

* start work on passing in an already constructed xml::lite::validator

* a bit closer to being able to create/use xml::lite::validator outside of XMLControl::validate()

* Squashed commit of the following:

commit bb2bb5aaf944040ea5bc42168b846324287dcad8
Merge: bbba5a210 4c146e7d0
Author: Dan Smith <[email protected]>
Date:   Mon Jun 12 13:04:09 2023 -0400

    Merge commit '4c146e7d01b14cf408b0e398cba96705df69090c' into develop/sync_externals

commit 4c146e7d01b14cf408b0e398cba96705df69090c
Author: Dan Smith <[email protected]>
Date:   Mon Jun 12 13:04:09 2023 -0400

    Squashed 'externals/coda-oss/' changes from aeec0131c..c88b9c053

    c88b9c053 types::complex<T> (#681)
    d1244a080 don't need our own make_unique in C++14 (#680)

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

commit bbba5a210c0257f622781914e9d228eeca23341c
Author: Dan Smith <[email protected]>
Date:   Mon Jun 12 13:04:06 2023 -0400

    latest from CODA-OSS

commit 370dd8876136755230624ebc955bc67642b1482b
Merge: 58ff5a537 ffe1caafd
Author: Dan Smith <[email protected]>
Date:   Mon Jun 12 13:03:25 2023 -0400

    Merge branch 'main' into develop/sync_externals

commit 58ff5a5371d9158910e99613f4ce6e6fc36e543e
Author: Dan Smith <[email protected]>
Date:   Thu Jun 8 16:23:08 2023 -0400

    latest from CODA-OSS

commit 3bfc33a40274fa7a073983d4e4ddd907e45730d2
Author: Dan Smith <[email protected]>
Date:   Thu Jun 8 14:34:45 2023 -0400

    latest from CODA-OSS and NITRO

commit 389417a983778ba2a07af9c6dbfea80484324b97
Merge: bce7ba0b1 4ad490fe4
Author: Dan Smith <[email protected]>
Date:   Thu Jun 8 14:34:28 2023 -0400

    latest from CODA-OSS and NITRO

commit 4ad490fe4224df18ce4a437c40a257af0686140e
Author: Dan Smith <[email protected]>
Date:   Thu Jun 8 14:34:22 2023 -0400

    Squashed 'externals/nitro/' changes from c8ecbe9ae..05dae18a3

    05dae18a3 patch to build other projects
    8f974e995 NITRO-2.11.3 (#554)
    870aa6afd update to coda-oss 2023-06-05 (#553)
    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)
    089ba0b5b latest from coda-oss
    3b52f0025 latest from coda-oss (#547)
    90c6263e2 latest from coda-oss (#544)
    90d513ac5 latest from coda-oss (#543)

    git-subtree-dir: externals/nitro
    git-subtree-split: 05dae18a3a9c5ad70e1ce814c21ca8ec278829be

commit 86929db19a438630d531ca0c34bdcd8e8c527ae9
Author: Dan Smith <[email protected]>
Date:   Thu Jun 8 14:34:18 2023 -0400

    Squashed 'externals/coda-oss/' changes from e87c32b4d..aeec0131c

    aeec0131c assert()s for mem::CopyablePtr (#679)
    72b0ebd60 add types::complex_short (#678)
    932130a58 patch to build other projects
    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)
    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
    1f9fd88d6 remove spurious
    47684c45b byteSwap now uses byte buffers (#670)
    cbc659db2 add swapBytes() utility from SIX (#669)
    891481b64 simplify byte-swapping (#668)
    540ae763e more byteSwap() tweaks
    0774c03c4 threaded byteSwap() (#667)
    d156370d3 swapping a single-byte value makes no sense
    c120e3255 be sure parameter is used to avoid compiler warning
    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)
    0b7d581fa remove transform_async() (#663)
    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
    857ff0af3 HighFive utility routines (#661)
    1d687db57 writeDataSet() utility overload
    106aa6894 sigh ... H5Easy::dump() fill fails on Windows/WAF :-(
    2641b60b2 Merge branch 'main' into feature/hdf5
    35c19e7e8 change actions to @v3 (#660)
    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?
    cde6147ce tweak HighFive wrappers (#659)
    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: aeec0131c51497c5d448a39be0d2df608d93bc15

commit bce7ba0b1ae40e9ddcb4f24610e7e4d702272d54
Merge: 646b70e8d 86929db19
Author: Dan Smith <[email protected]>
Date:   Thu Jun 8 14:34:18 2023 -0400

    Merge commit '86929db19a438630d531ca0c34bdcd8e8c527ae9' into develop/sync_externals

commit 646b70e8d47438211451493837e6b2d76db4e896
Author: Dan Smith <[email protected]>
Date:   Thu Jun 8 14:34:13 2023 -0400

    latest from CODA-OSS and NITRO

* slam in "main"

* use our own types::complex for complex<short>, et. al.

* Have the compiler pick between std::complex and details::complex

* more use of types::complex

* slam in "main"

* build coda-oss.vcxproj in six.sln

* match YAML from coda-oss; use msbuild to build six.sln

* remove extra '\'

* need other stuff from CODA-OSS to build coda-oss.vcxproj

* build six.sln against a SIX install

* consistent project settings

* consistent project settings

* Squashed commit of the following:

commit c9cb326eee83638e209cf8ad914acf6765b4ed1e
Author: J. Daniel Smith <[email protected]>
Date:   Fri Jul 14 10:36:07 2023 -0400

    latest from CODA-OSS and NITRO

commit fe6ba2a13f2e941b2a83943981676c677e0b07db
Merge: 15d0336d3 2e609250f
Author: J. Daniel Smith <[email protected]>
Date:   Fri Jul 14 10:32:19 2023 -0400

    Merge branch 'main' into develop/sync_externals

commit 15d0336d3eed525729b0087b08ad754712aa0164
Author: Dan Smith <[email protected]>
Date:   Mon Jul 10 16:27:24 2023 -0400

    =default doesn't implement the destructor

commit 61095290d3cb6ae98537eb638c410452bea16553
Author: Dan Smith <[email protected]>
Date:   Mon Jul 10 16:13:37 2023 -0400

    somewhere a compiler warning got unsuppressed

commit ca98de027cd41fecbff9e8b1b9cdb311969c64f2
Author: Dan Smith <[email protected]>
Date:   Mon Jul 10 15:27:14 2023 -0400

    latest from CODA-OSS and NITRO

commit 6c6fd14a96c0516297fa7c64522aac3353032b1c
Merge: d4c971de4 34b23e92f
Author: Dan Smith <[email protected]>
Date:   Mon Jul 10 15:26:54 2023 -0400

    sync_externals

commit 34b23e92fa6b58a4d0a5f4bc9e4fbc50298b574c
Author: Dan Smith <[email protected]>
Date:   Mon Jul 10 15:26:48 2023 -0400

    Squashed 'externals/nitro/' changes from 49ec50325..b4ae2d429

    b4ae2d429 match YAML from coda-oss
    176bcaf6d build NITRO.SLN using msbuild (#562)
    85e9043b8 latest from CODA-OSS (#561)

    git-subtree-dir: externals/nitro
    git-subtree-split: b4ae2d4290dcc5482970980ebe85719436990647

commit d4c971de47e47d6d8b2d42bfe784cd2ceff28fae
Merge: d60eddd07 3b07146d5
Author: Dan Smith <[email protected]>
Date:   Mon Jul 10 15:26:44 2023 -0400

    Merge commit '3b07146d57387ad695a7c0745c77c6c891338212' into develop/sync_externals

commit 3b07146d57387ad695a7c0745c77c6c891338212
Author: Dan Smith <[email protected]>
Date:   Mon Jul 10 15:26:44 2023 -0400

    Squashed 'externals/coda-oss/' changes from c2fc5fc66..f70b4202f

    f70b4202f account for coda-oss.vcxproj being in other SLNs
    af3faebfc Remove more compiler/code-analysis warnings (#699)
    82be2a6db unittests should work w/o install (#698)
    dbb90a06d add msbuild for coda-oss.sln (#697)
    5a417140a reduce compiler warnings (#696)
    288619dfa all modules now part of coda-oss.vcxproj (#695)

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

commit d60eddd077c52ad97b5d1ed07868d47d9086ee39
Author: Dan Smith <[email protected]>
Date:   Mon Jul 10 15:26:36 2023 -0400

    latest from CODA-OSS and NITRO

commit e275c075aead24849470f2dbdf5cf99cc8c3253d
Merge: d606c616b 417ea3f70
Author: Dan Smith <[email protected]>
Date:   Mon Jul 10 15:26:03 2023 -0400

    Merge branch 'main' into develop/sync_externals

commit d606c616b54e49098daa1051dd71ec0c96c9c245
Merge: 36beb996e 8e847cb0d
Author: Dan Smith <[email protected]>
Date:   Wed Jul 5 14:01:51 2023 -0400

    Merge branch 'main' into develop/sync_externals

commit 36beb996ee23058033dcf0de043486b571bf0673
Author: Dan Smith <[email protected]>
Date:   Wed Jul 5 13:48:37 2023 -0400

    sync_externals

commit 11665af92c23e646f6a5cd1585328571ba024f1f
Merge: 388bdad2d 9a22788e8
Author: Dan Smith <[email protected]>
Date:   Wed Jul 5 13:48:19 2023 -0400

    sync_externals

commit 9a22788e84e9ef6e38e4b138ff6fecbd8b35b995
Author: Dan Smith <[email protected]>
Date:   Wed Jul 5 13:48:06 2023 -0400

    Squashed 'externals/nitro/' changes from cee9feb42..49ec50325

    49ec50325 use new "PlatformToolkit" special environment variable (#560)
    6c06e3711 latest from CODA-OSS (#559)

    git-subtree-dir: externals/nitro
    git-subtree-split: 49ec50325d0dcdef40b63dd440afdb82d6b6d379

commit ea623b4ee1de1651418d5d4424201df95915dca8
Author: Dan Smith <[email protected]>
Date:   Wed Jul 5 13:48:02 2023 -0400

    Squashed 'externals/coda-oss/' changes from 54033e70e..c2fc5fc66

    c2fc5fc66 add more projects to coda-oss-lite.vcxproj (#694)
    ceb86c186 support $(PlatformToolset) as a "special" environment variable (#693)
    d78a8595a OS::getSIMDInstructionSet() utility (#692)
    2d2df467d fix `python3 waf dumplib`

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

commit 388bdad2d66759d54544f3fd3302b5c2c4c027b6
Merge: f47cbbcc5 ea623b4ee
Author: Dan Smith <[email protected]>
Date:   Wed Jul 5 13:48:02 2023 -0400

    Merge commit 'ea623b4ee1de1651418d5d4424201df95915dca8' into develop/sync_externals

commit f47cbbcc590bc28d09577dda35d3b6f5eb682b20
Author: Dan Smith <[email protected]>
Date:   Wed Jul 5 13:47:40 2023 -0400

    latest from CODA-OSS and NITRO

commit f25c53a3afee8fa3e016170da928996c6379dc23
Merge: c747f326b d2221ad33
Author: Dan Smith <[email protected]>
Date:   Wed Jul 5 13:47:05 2023 -0400

    Merge branch 'main' into develop/sync_externals

commit c747f326b60ba8a82b3c33e91aabe2651d6bb13d
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:30:50 2023 -0400

    latest from CODA-OSS and NITRO

commit b142ec4fcb2a8007e35e3d68e0ae752f4b2828d0
Merge: 2829f93c9 3d4e554aa
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:30:15 2023 -0400

    sync_externals

commit 3d4e554aa3934c7157bf9c2e57e2482662938b10
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:30:07 2023 -0400

    Squashed 'externals/nitro/' changes from 3f01809fa..cee9feb42

    cee9feb42 latest from CODA-OSS (#558)

    git-subtree-dir: externals/nitro
    git-subtree-split: cee9feb424b0f9c1f11f37f67a1795b3cc5e8dd1

commit 2829f93c9de0e8787dbe6cb319d6f32143dcdd8e
Merge: e47ccf30e 12995e63a
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:29:10 2023 -0400

    Merge branch 'main' into develop/sync_externals

commit e47ccf30e059e0cd32b42dc90a45f4b8a8512caf
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:19:10 2023 -0400

    latest from CODA-OSS

commit 04090c4a13b921f33257662950e46bfc2e58cabb
Merge: cc6009422 ac1ccde84
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:18:41 2023 -0400

    sync_externals

commit ac1ccde84b2be856ac947b2670dd8228c9980889
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:18:34 2023 -0400

    Squashed 'externals/nitro/' changes from c8ecbe9ae..3f01809fa

    3f01809fa latest from coda-oss (#557)
    471fb3fc1 Update test_j2k_loading++.cpp
    b12caf2fc latest from CODA-OSS (#556)
    0cd432624 use sys::make_span (#555)
    05dae18a3 patch to build other projects
    8f974e995 NITRO-2.11.3 (#554)
    870aa6afd update to coda-oss 2023-06-05 (#553)
    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)
    089ba0b5b latest from coda-oss
    3b52f0025 latest from coda-oss (#547)
    90c6263e2 latest from coda-oss (#544)
    90d513ac5 latest from coda-oss (#543)

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

commit 1ceb8e3ffb55a240085250cfde3f4d1ab7ef0b04
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:18:30 2023 -0400

    Squashed 'externals/coda-oss/' changes from e87c32b4d..54033e70e

    54033e70e Merge branch 'main' into feature/complex_short
    3c63f9f65 std::numbers from C++20 (#691)
    892dd0e00 ComplexInteger and ComplexReal to better match existing naming conventions (#690)
    b3872181e match coda-oss naming conventions (#688)
    704d6867f beef-up our complex type (#687)
    47c1c1cd6 check is_absolute() for URLs (#686)
    c042373e1 be sure our Path::isAbolute() matches std::filesystem::path::absolute() (#684)
    ad10286bc volatile is about "special" memory, not threading (#685)
    f4d42005f fix build error in NITRO
    ff11a5557 keep using std::complex<short> for now (#682)
    c88b9c053 types::complex<T> (#681)
    d1244a080 don't need our own make_unique in C++14 (#680)
    aeec0131c assert()s for mem::CopyablePtr (#679)
    72b0ebd60 add types::complex_short (#678)
    932130a58 patch to build other projects
    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)
    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
    1f9fd88d6 remove spurious
    47684c45b byteSwap now uses byte buffers (#670)
    cbc659db2 add swapBytes() utility from SIX (#669)
    891481b64 simplify byte-swapping (#668)
    540ae763e more byteSwap() tweaks
    0774c03c4 threaded byteSwap() (#667)
    d156370d3 swapping a single-byte value makes no sense
    c120e3255 be sure parameter is used to avoid compiler warning
    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)
    0b7d581fa remove transform_async() (#663)
    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
    857ff0af3 HighFive utility routines (#661)
    1d687db57 writeDataSet() utility overload
    106aa6894 sigh ... H5Easy::dump() fill fails on Windows/WAF :-(
    2641b60b2 Merge branch 'main' into feature/hdf5
    35c19e7e8 change actions to @v3 (#660)
    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?
    cde6147ce tweak HighFive wrappers (#659)
    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: 54033e70e353da94340dd7b96d0b1c6652308952

commit cc6009422ec41dd6e48ade90c37bdbfd97a1bc35
Merge: fec3755e0 1ceb8e3ff
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:18:30 2023 -0400

    Merge commit '1ceb8e3ffb55a240085250cfde3f4d1ab7ef0b04' into develop/sync_externals

commit fec3755e04a8311103aef1ded477b17ce826b044
Author: Dan Smith <[email protected]>
Date:   Mon Jun 19 14:18:05 2023 -0400

    latest from CODA-OSS

* consistent VCXPROJ settings

* fix NITF-C build errors

* explicitly link against xerces and xml.lite

* match YAML in coda-oss

* Squashed commit of the following:

commit 5e79844947b46f1102627fa62857e4c40e75b92a
Author: Dan Smith <[email protected]>
Date:   Tue Jul 18 14:12:02 2023 -0400

    latest from CODA-OSS and NITRO

commit 10ed7436736c7e0ee16fe968f67b3602e7668c6a
Merge: 8aaead72f 3da54d84f
Author: Dan Smith <[email protected]>
Date:   Tue Jul 18 14:11:43 2023 -0400

    sync_externals

commit 3da54d84f45c202c9e9659926e4cb0f6f9f44dea
Author: Dan Smith <[email protected]>
Date:   Tue Jul 18 14:11:35 2023 -0400

    Squashed 'externals/nitro/' changes from 225273436..de91d4977

    de91d…
  • Loading branch information
J. Daniel Smith committed Nov 15, 2023
1 parent 2adf5ae commit d90e4c4
Show file tree
Hide file tree
Showing 48 changed files with 610 additions and 214 deletions.
2 changes: 1 addition & 1 deletion UnitTest/UnitTest.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)six\modules\c++\scene\include;$(SolutionDir)six\modules\c++\six\include;$(SolutionDir)six\modules\c++\six.sidd\include;$(SolutionDir)six\modules\c++\six.sicd\include;$(SolutionDir)six\modules\c++\cphd\include;$(SolutionDir)six\modules\c++\cphd03\include;$(SolutionDir)externals\nitro\modules\c\nrt\include;$(SolutionDir)externals\nitro\modules\c\nitf\include;$(SolutionDir)externals\nitro\modules\c++\nitf\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration);$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration);$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;SIX_DEFAULT_SCHEMA_PATH=R"($(SolutionDir)install-$(Configuration)-$(Platform).$(PlatformToolset)\conf\schema\six)";%(PreprocessorDefinitions);_SILENCE_NONFLOATING_COMPLEX_DEPRECATION_WARNING</PreprocessorDefinitions>
Expand Down
7 changes: 5 additions & 2 deletions externals/coda-oss/modules/c++/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,11 @@ set(TARGET_LANGUAGE c++)
if (MSVC)
# By default, there is a /W3 on the command-line from somewhere (?); adding
# /Wn results in a compiler warning.
#add_compile_options(/W4) # /Wall
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # /Wall
#
# https://github.com/microsoft/STL/wiki/Changelog#vs-2022-179-preview-1
# > *Note*: `/Wall` is not intended for regular production use, as it contains a large number of
# > extremely noisy and low-value warnings. In general, the STL does not attempt to be `/Wall` clean.
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # add_compile_options(/W4)

elseif (UNIX)
# https://gcc.gnu.org/onlinedocs/gcc/Warning-Options.html
Expand Down
4 changes: 2 additions & 2 deletions externals/coda-oss/modules/c++/coda-oss.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -564,7 +564,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>EnableAllWarnings</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_LIB;%(PreprocessorDefinitions);CODA_OSS_EXPORTS;CODA_OSS_DLL;MT_DEFAULT_PINNING=0;RE_ENABLE_STD_REGEX=1</PreprocessorDefinitions>
<ForcedIncludeFiles>pch.h</ForcedIncludeFiles>
Expand Down Expand Up @@ -593,7 +593,6 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
Expand All @@ -609,6 +608,7 @@
<ConformanceMode>true</ConformanceMode>
<AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<WarningLevel>Level3</WarningLevel>
</ClCompile>
<Link>
<SubSystem>
Expand Down
1 change: 1 addition & 0 deletions externals/coda-oss/modules/c++/str/include/str/Convert.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@ inline auto toString(long double value)
{
return toString_(value);
}

inline std::string toString(uint8_t value)
{
return toString(gsl::narrow<unsigned int>(value));
Expand Down
21 changes: 7 additions & 14 deletions externals/coda-oss/modules/c++/str/source/Convert.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,32 +42,25 @@ template<> std::string str::toType<std::string>(const std::string& s)

template<> bool str::toType<bool>(const std::string& s)
{
std::string ss = s;
str::lower(ss);

if (ss == "true")
if (eq(s, "true")) // case-insensitive compare
{
return true;
}
else if (ss == "false")
if (eq(s, "false")) // case-insensitive compare
{
return false;
}
else if (str::isNumeric(ss))

// no need for lower(), digits don't have case
if (str::isNumeric(s))
{
int value(0);
std::stringstream buf(ss);
std::stringstream buf(s);
buf >> value;
return (value != 0);
}
else
{
throw except::BadCastException(except::Context(__FILE__, __LINE__,
std::string(""), std::string(""),
std::string("Invalid bool: '") + s + std::string("'")));
}

return false;
throw except::BadCastException(except::Context(__FILE__, __LINE__, "", "", "Invalid bool: '" + s + "'"));
}

long long str::strtoll(const char *str, char **endptr, int base)
Expand Down
4 changes: 3 additions & 1 deletion externals/nitro/UnitTest/UnitTest.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
#include "pch.h"
#include "CppUnitTest.h"

#include <nitf/PluginRegistry.h>
#include <nitf/UnitTests.hpp>

// https://learn.microsoft.com/en-us/visualstudio/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference?view=vs-2022
TEST_MODULE_INITIALIZE(methodName)
{
// module initialization code
nitf::Test::setNitfPluginPath();
nitf_PluginRegistry_PreloadedTREHandlersEnable(NRT_TRUE);
nitf::Test::j2kSetNitfPluginPath();
}
5 changes: 1 addition & 4 deletions externals/nitro/UnitTest/UnitTest.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<PrecompiledHeader>Use</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(ProjectDir);$(SolutionDir)modules\c\nrt\include;$(SolutionDir)modules\c\nitf\include;$(SolutionDir)modules\c++\nitf\include;$(SolutionDir)modules\c\j2k\include;$(SolutionDir)modules\c;$(SolutionDir)modules\c++;$(SolutionDir)externals\coda-oss\modules\c++;$(SolutionDir)externals\coda-oss\out\install\$(Platform)-$(Configuration)\include;$(SolutionDir)out\install\$(Platform)-$(Configuration)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
Expand Down Expand Up @@ -258,9 +258,6 @@
<ProjectReference Include="..\modules\c\nitf-c.vcxproj">
<Project>{f06550ad-cfc7-40b8-8727-6c82c69a8982}</Project>
</ProjectReference>
<ProjectReference Include="..\modules\c\nitf\ENGRDA.vcxproj">
<Project>{53f9f908-c678-4dee-9309-e71c1e03a45f}</Project>
</ProjectReference>
<ProjectReference Include="..\modules\c\nitf\XML_DATA_CONTENT.vcxproj">
<Project>{78849481-d356-4cc7-b182-31c21f857ed1}</Project>
</ProjectReference>
Expand Down
2 changes: 1 addition & 1 deletion externals/nitro/UnitTest/nitf-c++.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

#include <import/nitf.hpp>
#include <nitf/UnitTests.hpp>
#include <nitf/TREField.hpp>
#include <nitf/TREsTyped.hpp>
#include <nitf/TestingTest.hpp>
#include <nitf/J2KReader.hpp>
#include <nitf/J2KWriter.hpp>
Expand Down
9 changes: 6 additions & 3 deletions externals/nitro/modules/c++/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,12 @@ set(TARGET_LANGUAGE c++)
# turn on warnings as errors
if (MSVC)
# By default, there is a /W3 on the command-line from somewhere (?); adding
# /W4 results in a compiler warning.
#add_compile_options(/W4) # /Wall
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # /Wall
# /Wn results in a compiler warning.
#
# https://github.com/microsoft/STL/wiki/Changelog#vs-2022-179-preview-1
# > *Note*: `/Wall` is not intended for regular production use, as it contains a large number of
# > extremely noisy and low-value warnings. In general, the STL does not attempt to be `/Wall` clean.
string(REGEX REPLACE "/W[0-4]" "/W4" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") # add_compile_options(/W4)

elseif (UNIX)
#add_compile_options(-Wall -pedantic -Wextra)
Expand Down
4 changes: 3 additions & 1 deletion externals/nitro/modules/c++/nitf-c++.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@
<ClInclude Include="nitf\include\nitf\TextSubheader.hpp" />
<ClInclude Include="nitf\include\nitf\TRE.hpp" />
<ClInclude Include="nitf\include\nitf\TREField.hpp" />
<ClInclude Include="nitf\include\nitf\TREsTyped.hpp" />
<ClInclude Include="nitf\include\nitf\UnitTests.hpp" />
<ClInclude Include="nitf\include\nitf\Utils.hpp" />
<ClInclude Include="nitf\include\nitf\Version.hpp" />
Expand Down Expand Up @@ -213,7 +214,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>EnableAllWarnings</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
Expand All @@ -232,6 +233,7 @@
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>
Expand Down
3 changes: 3 additions & 0 deletions externals/nitro/modules/c++/nitf-c++.vcxproj.filters
View file
Original file line number Diff line number Diff line change
Expand Up @@ -463,5 +463,8 @@
<ClInclude Include="nitf\include\nitf\UnitTests.hpp">
<Filter>Header Files</Filter>
</ClInclude>
<ClInclude Include="nitf\include\nitf\TREsTyped.hpp">
<Filter>Header Files</Filter>
</ClInclude>
</ItemGroup>
</Project>
3 changes: 2 additions & 1 deletion externals/nitro/modules/c++/nitf/apps/show_nitf++/show_nitf++.vcxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<WarningLevel>EnableAllWarnings</WarningLevel>
<WarningLevel>Level4</WarningLevel>
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
Expand All @@ -65,6 +65,7 @@
<SupportJustMyCode>true</SupportJustMyCode>
<EnableEnhancedInstructionSet>AdvancedVectorExtensions2</EnableEnhancedInstructionSet>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<TreatWarningAsError>true</TreatWarningAsError>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
Expand Down
3 changes: 0 additions & 3 deletions externals/nitro/modules/c++/nitf/include/nitf/TRE.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -366,9 +366,6 @@ DECLARE_CLASS(TRE)
*/
std::string getID() const;

private:
std::string truncate(const std::string& value, size_t maxDigits) const;

mutable nitf_Error error{};
};
}
Expand Down
120 changes: 120 additions & 0 deletions externals/nitro/modules/c++/nitf/include/nitf/TREsTyped.hpp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
/* =========================================================================
* This file is part of NITRO
* =========================================================================
*
* (C) Copyright 2004 - 2014, MDA Information Systems LLC
* © Copyright 2023, Maxar Technologies, Inc.
*
* NITRO 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, If not,
* see <http://www.gnu.org/licenses/>.
*
*/

#pragma once

#include "TREField.hpp"

// A sample (and simple) "strongly-typed" TRE; see ENGRDA in the
// unittests for something a bit more elaborate (not included because it's incomplete).
namespace nitf
{
namespace TREs
{
class TEST_DES final
{
nitf::TRE tre_;
static constexpr const char* tag = "TEST_DES";

public:
// from TRE::getID()
/**
* Get the TRE identifier. This is NOT the tag, however it may be the
* same value as the tag. The ID is used to identify a specific
* version/incarnation of the TRE, if multiple are possible. For most TREs,
* this value will be the same as the tag.
*/
TEST_DES(const std::string& id = "") noexcept(false)
: tre_(tag, id.empty() ? tag : id.c_str()),
TEST_DES_COUNT(tre_, "TEST_DES_COUNT"),
TEST_DES_START(tre_, "TEST_DES_START"),
TEST_DES_INCREMENT(tre_, "TEST_DES_INCREMENT")
{
}
~TEST_DES() = default;
TEST_DES(const TEST_DES&) = delete;
TEST_DES& operator=(const TEST_DES&) = delete;
TEST_DES(TEST_DES&&) = default;
TEST_DES& operator=(TEST_DES&&) = delete;

// From TEST_DES.c
/*
static nitf_TREDescription TEST_DES_description[] = {
{NITF_BCS_N, 2, "Number of data values", "TEST_DES_COUNT" },
{NITF_BCS_N, 3, "Start value in ramp", "TEST_DES_START" },
{NITF_BCS_N, 2, "Increment between values in ramp", "TEST_DES_INCREMENT" },
{NITF_END, 0, NULL, NULL}
};
*/
nitf::TREField_BCS_N<2> TEST_DES_COUNT;
nitf::TREField_BCS_N<3> TEST_DES_START;
nitf::TREField_BCS_N<2> TEST_DES_INCREMENT;

void updateFields()
{
tre_.updateFields();
}
};

class TEST_PRELOADED_DES final
{
nitf::TRE tre_;
static constexpr const char* tag = "TEST_PRELOADED_DES";

public:
// from TRE::getID()
/**
* Get the TRE identifier. This is NOT the tag, however it may be the
* same value as the tag. The ID is used to identify a specific
* version/incarnation of the TRE, if multiple are possible. For most TREs,
* this value will be the same as the tag.
*/
TEST_PRELOADED_DES(const std::string& id = "") noexcept(false) : tre_(tag, id.empty() ? tag : id.c_str()),
COUNT(tre_, "COUNT"), START(tre_, "START"), INCREMENT(tre_, "INCREMENT") { }
~TEST_PRELOADED_DES() = default;
TEST_PRELOADED_DES(const TEST_PRELOADED_DES&) = delete;
TEST_PRELOADED_DES& operator=(const TEST_PRELOADED_DES&) = delete;
TEST_PRELOADED_DES(TEST_PRELOADED_DES&&) = default;
TEST_PRELOADED_DES& operator=(TEST_PRELOADED_DES&&) = delete;

// From TREs.c
/*
static nitf_TREDescription TEST_PRELOADED_DES_description[] = {
{NITF_BCS_N, 2, "Number of data values", "COUNT" },
{NITF_BCS_N, 3, "Start value in ramp", "START" },
{NITF_BCS_N, 2, "Increment between values in ramp", "INCREMENT" },
{NITF_END, 0, NULL, NULL}
};
*/
nitf::TREField_BCS_N<2> COUNT;
nitf::TREField_BCS_N<3> START;
nitf::TREField_BCS_N<2> INCREMENT;

void updateFields()
{
tre_.updateFields();
}
};

} // namespace TREs
} // namespace nitf
38 changes: 36 additions & 2 deletions externals/nitro/modules/c++/nitf/source/TRE.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ static bool endsWith(const std::string& s, const std::string& match) noexcept
return sLen >= mLen;
}

std::string TRE::truncate(const std::string& value, size_t maxDigits) const
static std::string truncate(const std::string& value, size_t maxDigits)
{
const size_t decimalIndex = value.find('.');
if (decimalIndex == std::string::npos)
Expand All @@ -184,6 +184,40 @@ std::string TRE::truncate(const std::string& value, size_t maxDigits) const
}
return value;
}
static std::string truncate(const nitf_Field& field, const std::string& value)
{
auto retval = truncate(value, field.length);

// From Field.h
if (field.type == NITF_BCS_A)
{
// is BCS-A data, it is space-filled, right-aligned.
while (retval.length() < field.length)
{
// copyAndFillSpaces() in Field.c "Spaces are added to the right"
retval += " ";
}
}
else if (field.type == NITF_BCS_N)
{
const auto decimalIndex = retval.find('.');

// If it is BCS-N, we expect zero-filled, left-aligned.
while (retval.length() < field.length)
{
if (decimalIndex == std::string::npos)
{
retval = "0" + retval;
}
else
{
retval += "0";
}
}
}

return retval;
}

void TRE::setFieldValue(const std::string& key, const void* data, size_t dataLength, bool forceUpdate)
{
Expand All @@ -207,7 +241,7 @@ void TRE::setFieldValue(const nitf_Field& field, const std::string& key, const s
else
{
// call truncate() first
const auto s = truncate(data, field.length);
const auto s = truncate(field, data);
setFieldValue(key, s.c_str(), s.size(), forceUpdate);
}
}
Expand Down
Loading

0 comments on commit d90e4c4

Please sign in to comment.