diff --git a/.gitattributes b/.gitattributes index 803f17ffe..c888454a3 100644 --- a/.gitattributes +++ b/.gitattributes @@ -7,55 +7,26 @@ CMakeLists.txt text eol=lf # Modern tools on Windows can handle Linux LF # See https://stackoverflow.com/a/13154031/8877 for details -* text=auto eol=lf -.git?* text +* text=auto eol=lf +*.* text=auto eol=lf +.git?* text=auto eol=lf # Leave known Windows-only text files as CR/LF -*.sln text eol=crlf -*.vcxproj text eol=crlf -*.vcxproj.filters text eol=crlf -*.ruleset text eol=crlf - -# Text file formats -*.txt text eol=lf -*.text text eol=lf -*.md text eol=lf -*.tex text eol=lf -*.?ml text eol=lf -*.kmz binary -*.log text eol=lf - -# Programming languages -*.htm? text eol=lf -*.css text eol=lf -*.c text eol=lf -*.cc text eol=lf -*.c?? text eol=lf -*.c??m text eol=lf -*.ccm text eol=lf -*.C text eol=lf -*.h?? text eol=lf -*.h text eol=lf -*.hh text eol=lf -*.ixx text eol=lf -*.mpp text eol=lf -*.py text eol=lf -*.pyc binary -# .f and .f90 -*.f* text eol=lf -*.m text eol=lf -*.java text eol=lf -*.cs text eol=lf -*.vb text eol=lf -*.js text eol=lf -*.ts text eol=lf -*.pl text eol=lf -*.sh text eol=lf -*.csh text eol=lf +*.sln text eol=crlf +*.dsw text eol=crlf +*.dsp text eol=crlf +*.vcproj text eol=crlf +*.vcxproj text eol=crlf +*.vcxproj.filters text eol=crlf +*.ruleset text eol=crlf +*.bat text eol=crlf ###################### # Known binary files +# Python builds with WAF +waf binary + # executables, libraries; yes, sometimes they're part of a repository *.exe binary *.out binary @@ -63,6 +34,8 @@ lib*.so* binary *.dll binary lib*.a* binary *.lib binary +*.mex binary +*.pyc binary # from various unit_test/ directories *.dat binary @@ -82,9 +55,10 @@ lib*.a* binary *.jpeg binary *.png binary # SVG images are XML -*.svg text eol=lf +*.svg text *.raw binary -*.hei* binary +*.hei? binary +*.kmz binary # music *.mp3 binary @@ -101,15 +75,21 @@ lib*.a* binary # documents *.pdf binary *.dvi binary -*.doc* binary -*.xls* binary -*.ppt* binary +*.doc binary +*.docx binary +*.xls binary +*.xlsx binary +*.ppt binary +*.pptx binary +# SAR *.h5 binary *.sio binary +*.hdr binary *.ntf binary *.nitf binary -*.si?d binary +*.sidd binary +*.sicd? binary # containers *.zip binary diff --git a/externals/coda-oss/.gitattributes b/externals/coda-oss/.gitattributes index 803f17ffe..c888454a3 100644 --- a/externals/coda-oss/.gitattributes +++ b/externals/coda-oss/.gitattributes @@ -7,55 +7,26 @@ CMakeLists.txt text eol=lf # Modern tools on Windows can handle Linux LF # See https://stackoverflow.com/a/13154031/8877 for details -* text=auto eol=lf -.git?* text +* text=auto eol=lf +*.* text=auto eol=lf +.git?* text=auto eol=lf # Leave known Windows-only text files as CR/LF -*.sln text eol=crlf -*.vcxproj text eol=crlf -*.vcxproj.filters text eol=crlf -*.ruleset text eol=crlf - -# Text file formats -*.txt text eol=lf -*.text text eol=lf -*.md text eol=lf -*.tex text eol=lf -*.?ml text eol=lf -*.kmz binary -*.log text eol=lf - -# Programming languages -*.htm? text eol=lf -*.css text eol=lf -*.c text eol=lf -*.cc text eol=lf -*.c?? text eol=lf -*.c??m text eol=lf -*.ccm text eol=lf -*.C text eol=lf -*.h?? text eol=lf -*.h text eol=lf -*.hh text eol=lf -*.ixx text eol=lf -*.mpp text eol=lf -*.py text eol=lf -*.pyc binary -# .f and .f90 -*.f* text eol=lf -*.m text eol=lf -*.java text eol=lf -*.cs text eol=lf -*.vb text eol=lf -*.js text eol=lf -*.ts text eol=lf -*.pl text eol=lf -*.sh text eol=lf -*.csh text eol=lf +*.sln text eol=crlf +*.dsw text eol=crlf +*.dsp text eol=crlf +*.vcproj text eol=crlf +*.vcxproj text eol=crlf +*.vcxproj.filters text eol=crlf +*.ruleset text eol=crlf +*.bat text eol=crlf ###################### # Known binary files +# Python builds with WAF +waf binary + # executables, libraries; yes, sometimes they're part of a repository *.exe binary *.out binary @@ -63,6 +34,8 @@ lib*.so* binary *.dll binary lib*.a* binary *.lib binary +*.mex binary +*.pyc binary # from various unit_test/ directories *.dat binary @@ -82,9 +55,10 @@ lib*.a* binary *.jpeg binary *.png binary # SVG images are XML -*.svg text eol=lf +*.svg text *.raw binary -*.hei* binary +*.hei? binary +*.kmz binary # music *.mp3 binary @@ -101,15 +75,21 @@ lib*.a* binary # documents *.pdf binary *.dvi binary -*.doc* binary -*.xls* binary -*.ppt* binary +*.doc binary +*.docx binary +*.xls binary +*.xlsx binary +*.ppt binary +*.pptx binary +# SAR *.h5 binary *.sio binary +*.hdr binary *.ntf binary *.nitf binary -*.si?d binary +*.sidd binary +*.sicd? binary # containers *.zip binary diff --git a/externals/coda-oss/ReleaseNotes.md b/externals/coda-oss/ReleaseNotes.md index 845b919fc..0c8abecb7 100644 --- a/externals/coda-oss/ReleaseNotes.md +++ b/externals/coda-oss/ReleaseNotes.md @@ -1,10 +1,18 @@ # coda-oss Release Notes +## [Release 2023-10-23](https://github.com/mdaus/coda-oss/releases/tag/2023-10-23) +* Tweaked **.gitattributes**. +* Removed *str::EncodedStringView*; made *str* conversion routines more consistent. +* *FmtX()* uses overloads rather than C-style varargs. +* Add [`std::ssize()`](https://en.cppreference.com/w/cpp/iterator/size). +* `ENABLE_AVX2` and `ENABLE_AVX512F` flags for CMake builds. +* Build cleanly with ASAN. + ## [Release 2023-08-18](https://github.com/mdaus/coda-oss/releases/tag/2023-08-18) * New `sys::OS::getSIMDInstructionSet()` utility routine; SSE2 is required (default with 64-bit builds). * `types::ComplexInteger` to work-around `std::complex` no longer being [valid C++](https://en.cppreference.com/w/cpp/numeric/complex). * Another round of reducing various compiler warnings (of note: `NULL` -> `nullptr`). -* Some suport for [`std::numbers`](https://en.cppreference.com/w/cpp/header/numbers) from C++20. +* Some support for [`std::numbers`](https://en.cppreference.com/w/cpp/header/numbers) from C++20. * Update to [HighFive 2.7.1](https://github.com/BlueBrain/HighFive/releases/tag/v2.7.1). * Update to [e2fsprogs 1.47.0](https://e2fsprogs.sourceforge.net/e2fsprogs-release.html#1.47.0). * Update to [xerces-c 3.2.4](https://issues.apache.org/jira/secure/ReleaseNote.jspa?version=12350542&styleName=Text&projectId=10510). 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 8e3b223c3..d14635575 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_ 2023 ## 0008 ## 0018 ## 0000 ## L +#define CODA_OSS_VERSION_ 2023 ## 0010 ## 0023 ## 0000 ## L // Use the same macros other projects might want to use; overkill for us. #define CODA_OSS_VERSION_MAJOR 2023 -#define CODA_OSS_VERSION_MINOR 8 -#define CODA_OSS_VERSION_PATCH 18 // a.k.a. "point," but too similar to "patch." +#define CODA_OSS_VERSION_MINOR 10 +#define CODA_OSS_VERSION_PATCH 23 // a.k.a. "point," but too similar to "patch." #define CODA_OSS_VERSION_BUILD 0 // a.k.a. "patch," but too similar to "point." #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/nitro/.gitattributes b/externals/nitro/.gitattributes index 803f17ffe..c888454a3 100644 --- a/externals/nitro/.gitattributes +++ b/externals/nitro/.gitattributes @@ -7,55 +7,26 @@ CMakeLists.txt text eol=lf # Modern tools on Windows can handle Linux LF # See https://stackoverflow.com/a/13154031/8877 for details -* text=auto eol=lf -.git?* text +* text=auto eol=lf +*.* text=auto eol=lf +.git?* text=auto eol=lf # Leave known Windows-only text files as CR/LF -*.sln text eol=crlf -*.vcxproj text eol=crlf -*.vcxproj.filters text eol=crlf -*.ruleset text eol=crlf - -# Text file formats -*.txt text eol=lf -*.text text eol=lf -*.md text eol=lf -*.tex text eol=lf -*.?ml text eol=lf -*.kmz binary -*.log text eol=lf - -# Programming languages -*.htm? text eol=lf -*.css text eol=lf -*.c text eol=lf -*.cc text eol=lf -*.c?? text eol=lf -*.c??m text eol=lf -*.ccm text eol=lf -*.C text eol=lf -*.h?? text eol=lf -*.h text eol=lf -*.hh text eol=lf -*.ixx text eol=lf -*.mpp text eol=lf -*.py text eol=lf -*.pyc binary -# .f and .f90 -*.f* text eol=lf -*.m text eol=lf -*.java text eol=lf -*.cs text eol=lf -*.vb text eol=lf -*.js text eol=lf -*.ts text eol=lf -*.pl text eol=lf -*.sh text eol=lf -*.csh text eol=lf +*.sln text eol=crlf +*.dsw text eol=crlf +*.dsp text eol=crlf +*.vcproj text eol=crlf +*.vcxproj text eol=crlf +*.vcxproj.filters text eol=crlf +*.ruleset text eol=crlf +*.bat text eol=crlf ###################### # Known binary files +# Python builds with WAF +waf binary + # executables, libraries; yes, sometimes they're part of a repository *.exe binary *.out binary @@ -63,6 +34,8 @@ lib*.so* binary *.dll binary lib*.a* binary *.lib binary +*.mex binary +*.pyc binary # from various unit_test/ directories *.dat binary @@ -82,9 +55,10 @@ lib*.a* binary *.jpeg binary *.png binary # SVG images are XML -*.svg text eol=lf +*.svg text *.raw binary -*.hei* binary +*.hei? binary +*.kmz binary # music *.mp3 binary @@ -101,15 +75,21 @@ lib*.a* binary # documents *.pdf binary *.dvi binary -*.doc* binary -*.xls* binary -*.ppt* binary +*.doc binary +*.docx binary +*.xls binary +*.xlsx binary +*.ppt binary +*.pptx binary +# SAR *.h5 binary *.sio binary +*.hdr binary *.ntf binary *.nitf binary -*.si?d binary +*.sidd binary +*.sicd? binary # containers *.zip binary diff --git a/externals/nitro/ReleaseNotes.md b/externals/nitro/ReleaseNotes.md index 061c950bc..7111a792e 100644 --- a/externals/nitro/ReleaseNotes.md +++ b/externals/nitro/ReleaseNotes.md @@ -1,8 +1,12 @@ # NITRO (NITF i/o) Release Notes +## [Version 2.11.5](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.5); October 23, 2023 +* [coda-oss](https://github.com/mdaus/coda-oss) release [2023-10-23](https://github.com/mdaus/coda-oss/releases/tag/2023-10-23) +* Fix some ASAN diagnostics, still more to do. + ## [Version 2.11.4](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.4); August 18 5, 2023 * [coda-oss](https://github.com/mdaus/coda-oss) release [2023-08-18](https://github.com/mdaus/coda-oss/releases/tag/2023-08-18) -* added **.gitattributes** and normalized line-endings (`\n` for most text files). +* Added **.gitattributes** and normalized line-endings (`\n` for most text files). ## [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) diff --git a/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp b/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp index 74935b96b..5532fab46 100644 --- a/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp +++ b/externals/nitro/modules/c++/nitf/include/nitf/Version.hpp @@ -38,9 +38,10 @@ // 2.11.2 December 14, 2022 // 2.11.3 June 5, 2023 // 2.11.4 August 18, 2023 + // 2.11.5 October 23, 2023 #define NITF_VERSION_MAJOR 2 #define NITF_VERSION_MINOR 11 -#define NITF_VERSION_PATCH 4 // a.k.a. "point," but too similar to "patch." +#define NITF_VERSION_PATCH 5 // a.k.a. "point," but too similar to "patch." #define NITF_VERSION_BUILD 0 // a.k.a. "patch," but too similar to "point." #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 1c142e91f..46c83f80c 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.4" +#define NRT_LIB_VERSION "2.11.5" #endif