diff --git a/six/modules/c++/cphd/cphd.vcxproj b/six/modules/c++/cphd/cphd.vcxproj
index e7ab142f9..f7503b5b7 100644
--- a/six/modules/c++/cphd/cphd.vcxproj
+++ b/six/modules/c++/cphd/cphd.vcxproj
@@ -90,6 +90,7 @@
AdvancedVectorExtensions2
MultiThreadedDLL
stdc11
+ pch.h
diff --git a/six/modules/c++/cphd03/cphd03.vcxproj b/six/modules/c++/cphd03/cphd03.vcxproj
index 54d884e9d..22792629a 100644
--- a/six/modules/c++/cphd03/cphd03.vcxproj
+++ b/six/modules/c++/cphd03/cphd03.vcxproj
@@ -90,6 +90,7 @@
AdvancedVectorExtensions2
MultiThreadedDLL
stdc11
+ pch.h
diff --git a/six/modules/c++/scene/scene.vcxproj b/six/modules/c++/scene/scene.vcxproj
index 0eb0e122a..4ac8f2688 100644
--- a/six/modules/c++/scene/scene.vcxproj
+++ b/six/modules/c++/scene/scene.vcxproj
@@ -92,6 +92,7 @@
AdvancedVectorExtensions2
MultiThreadedDLL
stdc11
+ pch.h
diff --git a/six/modules/c++/six.convert/six.convert.vcxproj b/six/modules/c++/six.convert/six.convert.vcxproj
index a28b85f3e..98b0446e6 100644
--- a/six/modules/c++/six.convert/six.convert.vcxproj
+++ b/six/modules/c++/six.convert/six.convert.vcxproj
@@ -89,6 +89,7 @@
AdvancedVectorExtensions2
MultiThreadedDLL
stdc11
+ pch.h
diff --git a/six/modules/c++/six.sicd/include/six/sicd/ImageData.h b/six/modules/c++/six.sicd/include/six/sicd/ImageData.h
index 55563b019..10d57f773 100644
--- a/six/modules/c++/six.sicd/include/six/sicd/ImageData.h
+++ b/six/modules/c++/six.sicd/include/six/sicd/ImageData.h
@@ -40,7 +40,11 @@ namespace six
namespace sicd
{
using cx_float = std::complex;
-using AMP8I_PHS8I_t = std::pair;
+struct AMP8I_PHS8I_t final // std::pair isn't trivial_copyable()
+{
+ uint8_t first; // amplitude
+ uint8_t second; // phase
+};
//! Fixed size 256 element array of complex values.
using input_values_t = std::array, UINT8_MAX + 1>;
//! Fixed size 256 x 256 matrix of complex values.
diff --git a/six/modules/c++/six.sicd/include/six/sicd/Utilities.h b/six/modules/c++/six.sicd/include/six/sicd/Utilities.h
index d56b06dbc..898a000c7 100644
--- a/six/modules/c++/six.sicd/include/six/sicd/Utilities.h
+++ b/six/modules/c++/six.sicd/include/six/sicd/Utilities.h
@@ -654,7 +654,7 @@ extern void writeAsNITF(const std::filesystem::path&, const std::vector> make_complex_image(const types::RowCol&);
- extern std::vector to_bytes(const ComplexImageResult&, ptrdiff_t cutoff=-1);
+ extern std::vector toBytes(const ComplexImageResult&, ptrdiff_t cutoff=-1);
}
}
diff --git a/six/modules/c++/six.sicd/six.sicd.vcxproj b/six/modules/c++/six.sicd/six.sicd.vcxproj
index 5127169e5..92b676a1e 100644
--- a/six/modules/c++/six.sicd/six.sicd.vcxproj
+++ b/six/modules/c++/six.sicd/six.sicd.vcxproj
@@ -90,6 +90,7 @@
AdvancedVectorExtensions2
MultiThreadedDLL
stdc11
+ pch.h
diff --git a/six/modules/c++/six.sicd/source/Utilities.cpp b/six/modules/c++/six.sicd/source/Utilities.cpp
index 6f04c5f66..71ef8251a 100644
--- a/six/modules/c++/six.sicd/source/Utilities.cpp
+++ b/six/modules/c++/six.sicd/source/Utilities.cpp
@@ -38,6 +38,8 @@
#include