From d864815fbf07dcdac6dd5807a6f1d7cb5c7df23e Mon Sep 17 00:00:00 2001 From: "J. Daniel Smith" Date: Mon, 23 Oct 2023 14:27:10 -0400 Subject: [PATCH] SIX-3.2.5 (#707) * SIX 3.1.15 * merge develop/sync_externals * Update ReleaseNotes.md for SIX 3.2.3 * SIX-3.2.4 * [coda-oss](https://github.com/mdaus/coda-oss) version [2023-08-18](https://github.com/mdaus/coda-oss/releases/tag/2023-08-18) * [nitro](https://github.com/mdaus/nitro) version [2.11.4](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.4) * Prepare for deprecating [`std::complex`](https://en.cppreference.com/w/cpp/numeric/complex), et. al. * Allow XML metadata to be parsed with `preserveCharacterData(true)` to keep white-space. * Added support for [CPHD 1.1.0](https://nsgreg.nga.mil/doc/view?i=5388) XML metadata. * added **.gitattributes** and normalized line-endings (`\n` for most text files). * Links to two bugfixes * release notes for SIX-3.2.5 --- ReleaseNotes.md | 10 +++++++++- six/modules/c++/six/include/six/Version.h | 3 ++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index 572288855..6aadfa0da 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -2,6 +2,14 @@ # SIX [Release](https://github.com/ngageoint/six-library/releases) Notes +## [Version 3.2.5](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.5); October 23, 2023 +* [coda-oss](https://github.com/mdaus/coda-oss) version [2023-10-23](https://github.com/mdaus/coda-oss/releases/tag/2023-10-23) +* [nitro](https://github.com/mdaus/nitro) version [2.11.5](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.5) +* Simplify 8AMP_PHSI interfaces. +* Be more explicit about the CPHD version being used. +* *io::OutputStream* overloads to make it easier to write CPHD data in pieces. +* Be sure XML strings are UTF-8. + ## [Version 3.2.4](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.4); August 21, 2023 * [coda-oss](https://github.com/mdaus/coda-oss) version [2023-08-18](https://github.com/mdaus/coda-oss/releases/tag/2023-08-18) * [nitro](https://github.com/mdaus/nitro) version [2.11.4](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.4) @@ -10,7 +18,7 @@ * Added support for [CPHD 1.1.0](https://nsgreg.nga.mil/doc/view?i=5388) XML metadata. * Bugfix: read SIDDs [without a LUT](https://github.com/ngageoint/six-library/pull/683). * Bugfix: [CPHD 'releaseInfo' can be empty](https://github.com/ngageoint/six-library/pull/670). -* added **.gitattributes** and normalized line-endings (`\n` for most text files). +* Added **.gitattributes** and normalized line-endings (`\n` for most text files). ## [Version 3.2.3](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.3); June 5, 2023 * [coda-oss](https://github.com/mdaus/coda-oss) version [2023-06-05](https://github.com/mdaus/coda-oss/releases/tag/2023-06-05) diff --git a/six/modules/c++/six/include/six/Version.h b/six/modules/c++/six/include/six/Version.h index 8f3b4a7fc..fc3fccd17 100644 --- a/six/modules/c++/six/include/six/Version.h +++ b/six/modules/c++/six/include/six/Version.h @@ -38,10 +38,11 @@ // SIX 3.2.2 2022-Dec-14 // SIX 3.2.3 2023-Jun-05 // SIX 3.2.4 2023-Aug-21 +// SIX 3.2.5 2023-Oct-23 #define SIX_VERSION_MAJOR 3 #define SIX_VERSION_MINOR 2 -#define SIX_VERSION_PATCH 4 // a.k.a. "point," but that's too similar to "patch." +#define SIX_VERSION_PATCH 5 // a.k.a. "point," but that's too similar to "patch." //#define SIX_VERSION_BUILD 0 // a.k.a. "patch," but that's too similar to "point." //#define SIX_VERSION CODA_OSS_MAKE_VERSION_MMPB(SIX_VERSION_MAJOR, SIX_VERSION_MINOR, SIX_VERSION_PATCH, SIX_VERSION_BUILD) #define SIX_VERSION CODA_OSS_MAKE_VERSION_MMP(SIX_VERSION_MAJOR, SIX_VERSION_MINOR, SIX_VERSION_PATCH)