Merge branch 'main' into develop/sync_externals

ngageoint · Dec 20, 2022 · cece590 · cece590
2 parents e47d874 + a247a5f
commit cece590
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 14 deletions.
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -2,6 +2,12 @@
 
 # SIX [Release](https://github.com/ngageoint/six-library/releases) Notes
 
+## [Version 3.2.2](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.2); December 14, 2022
+* [coda-oss](https://github.com/mdaus/coda-oss) version [2022-12-14](https://github.com/mdaus/coda-oss/releases/tag/2022-12-14)
+* [nitro](https://github.com/mdaus/nitro) version [2.11.2](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.2)
+* [Fixed slantToImagePartials not operating in slant plane](https://github.com/ngageoint/six-library/pull/613)
+* Continued effort at getting unittests to run in other projects.
+
 ## [Version 3.2.1](https://github.com/ngageoint/six-library/releases/tag/SIX-3.2.1); November 4, 2022
 * [coda-oss](https://github.com/mdaus/coda-oss) version [2022-11-04](https://github.com/mdaus/coda-oss/releases/tag/2022-11-04)
 * [nitro](https://github.com/mdaus/nitro) version [2.11.1](https://github.com/mdaus/nitro/releases/tag/NITRO-2.11.1)

diff --git a/externals/coda-oss/modules/c++/mem/include/mem/AutoPtr.h b/externals/coda-oss/modules/c++/mem/include/mem/AutoPtr.h
@@ -81,16 +81,21 @@ class AutoPtr final
         *this = std::move(p);
     }
 
-    template<typename U>
-    AutoPtr& operator=(std::auto_ptr<U> p) noexcept
+    template<typename TAutoPtr> // std::auto_ptr can cause deprecated warnings
+    AutoPtr& assign(TAutoPtr p) noexcept
     {
         ptr_.reset(p.release());
         return *this;
     }
-    template <typename U>
-    AutoPtr(std::auto_ptr<U> p) noexcept
+    template<typename TAutoPtr> // std::auto_ptr can cause deprecated warnings
+    AutoPtr& operator=(TAutoPtr p) noexcept
+    {
+        return assign(p);
+    }
+    template<typename TAutoPtr> // std::auto_ptr can cause deprecated warnings
+    AutoPtr(TAutoPtr p) noexcept
     {
-        *this = p;
+        *this = assign(p);
     }
 
 

diff --git a/six/modules/c++/six/include/six/Enum.h b/six/modules/c++/six/include/six/Enum.h
@@ -95,7 +95,8 @@ namespace details
         const auto result = nitf::details::index(map, v);
         if (!result.has_value())
         {
-            return std::optional<T>();
+            std::optional<T> retval; // some compilers think this is uninitialized
+            return retval;
         }
         // TValues will be "int" when used from the "Enum" base class
         return std::optional<T>(six::Enum::cast<T>(*result));

diff --git a/six/modules/c++/six/include/six/Version.h b/six/modules/c++/six/include/six/Version.h
@@ -27,17 +27,19 @@
 #include "config/Version.h"
 #include "nitf/Version.hpp"
 
- // SIX 3.2.1	2022-Nov-04
- // SIX 3.2.0	2022-Aug-30 (C++14)
-// SIX 3.1.14	2022-Aug-30 
-// SIX 3.1.13	2022-Aug-02
-// SIX 3.1.12	2022-Jun-29
-// SIX 3.1.11	2022-May-13
-// SIX 3.1.10	2022-May-03
 // SIX 3.1.9	2022-Feb-02
+// SIX 3.1.10	2022-May-03
+// SIX 3.1.11	2022-May-13
+// SIX 3.1.12	2022-Jun-29
+// SIX 3.1.13	2022-Aug-02
+// SIX 3.1.14	2022-Aug-30 
+// SIX 3.2.0	2022-Aug-30 (C++14)
+// SIX 3.2.1	2022-Nov-04
+// SIX 3.2.2	2022-Dec-14
+
 #define SIX_VERSION_MAJOR	3
 #define SIX_VERSION_MINOR	2
-#define SIX_VERSION_PATCH	1
+#define SIX_VERSION_PATCH	2
 //#define SIX_VERSION_BUILD	0
 //#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)