Merge branch 'main' into cpp17

ngageoint · Aug 21, 2023 · 4eda6f2 · 4eda6f2
2 parents 1f2b406 + c14f996
commit 4eda6f2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -2,12 +2,15 @@
 
 # SIX [Release](https://github.com/ngageoint/six-library/releases) Notes
 
-## [Version 3.?.?](https://github.com/ngageoint/six-library/releases/tag/SIX-3.?.?); ??? ?, 202?
-* [coda-oss](https://github.com/mdaus/coda-oss) version [202?-??-??](https://github.com/mdaus/coda-oss/releases/tag/2023-??-??)
-* [nitro](https://github.com/mdaus/nitro) version [2.?.?](https://github.com/mdaus/nitro/releases/tag/NITRO-2.?.?)
+## [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)
 * Prepare for deprecating [`std::complex<short>`](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.
+* 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).
 
 ## [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
@@ -37,11 +37,12 @@
 // SIX 3.2.1	2022-Nov-04
 // SIX 3.2.2	2022-Dec-14
 // SIX 3.2.3	2023-Jun-05
+// SIX 3.2.4	2023-Aug-21
 
 #define SIX_VERSION_MAJOR	3
 #define SIX_VERSION_MINOR	2
-#define SIX_VERSION_PATCH	3
-//#define SIX_VERSION_BUILD	0
+#define SIX_VERSION_PATCH	4 // 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)